diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 084d3e8dfa4f1496da20ed510a9d204e001f2ce6..3e6a05a257b30070fe21010c418daa719e254433 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -17,7 +17,6 @@ class ApplicationController < ActionController::Base @aspect = nil @aspects = current_user.aspects.fields(:name) @aspects_dropdown_array = @aspects.collect{|x| [x.to_s, x.id]} - @contacts = current_user.contacts end end diff --git a/app/controllers/aspects_controller.rb b/app/controllers/aspects_controller.rb index d6704f63b1e7a6be2133f3e6040d9b000fc6b6f7..988673fd35ad354a6eeeaf5b5b55da444be6ac88 100644 --- a/app/controllers/aspects_controller.rb +++ b/app/controllers/aspects_controller.rb @@ -11,6 +11,7 @@ class AspectsController < ApplicationController def index @posts = current_user.visible_posts(:_type => "StatusMessage").paginate :page => params[:page], :per_page => 15, :order => 'created_at DESC' @post_hashes = hashes_for_posts @posts + @contacts = current_user.contacts @aspect_hashes = hashes_for_aspects @aspects.all, @contacts, :limit => 8 @aspect = :all @@ -61,6 +62,7 @@ class AspectsController < ApplicationController def show @aspect = current_user.aspect_by_id params[:id] + @contacts = current_user.contacts unless @aspect render :file => "#{Rails.root}/public/404.html", :layout => false, :status => 404 else @@ -77,6 +79,7 @@ class AspectsController < ApplicationController def manage @aspect = :manage + @contacts = current_user.contacts @remote_requests = Request.hashes_for_person(current_user.person) @aspect_hashes = hashes_for_aspects @aspects, @contacts end