diff --git a/app/controllers/aspects_controller.rb b/app/controllers/aspects_controller.rb index dda2ed1ee9f07e8eba52e113d60315fe4159f8eb..39ec4c3b7e98c0e4d4b398cc518c90b62556efff 100644 --- a/app/controllers/aspects_controller.rb +++ b/app/controllers/aspects_controller.rb @@ -65,6 +65,8 @@ class AspectsController < ApplicationController @aspect_contacts = hashes_for_contacts Contact.all(:user_id => current_user.id, :aspect_ids.in => [@aspect.id], :pending => false) @aspect_contacts_count = @aspect_contacts.count + @all_contacts = hashes_for_contacts @contacts + @posts = @aspect.posts.find_all_by__type("StatusMessage", :order => 'created_at desc').paginate :page => params[:page], :per_page => 15 @post_hashes = hashes_for_posts @posts @post_count = @posts.count diff --git a/app/views/aspects/show.html.haml b/app/views/aspects/show.html.haml index b1de218739a929b42fd15b7f2e11853a00702f9d..f209ddae35d0cb16adae65108bce51be7783ed69 100644 --- a/app/views/aspects/show.html.haml +++ b/app/views/aspects/show.html.haml @@ -15,7 +15,7 @@ .span-8.append-1 = render 'aspects/aspect_contacts', :contacts => @aspect_contacts, :aspect => @aspect - = render 'aspects/edit_aspect_pane', :contacts => @aspect_contacts, :aspect => @aspect + = render 'aspects/edit_aspect_pane', :contacts => @all_contacts, :aspect => @aspect .span-15.last