diff --git a/app/controllers/aspects_controller.rb b/app/controllers/aspects_controller.rb index f8fbfa851..ecb4f33e6 100644 --- a/app/controllers/aspects_controller.rb +++ b/app/controllers/aspects_controller.rb @@ -36,7 +36,7 @@ class AspectsController < ApplicationController :page => params[:page], :per_page => 15, :order => sort_order + ' DESC') @fakes = PostsFake.new(@posts) - @contacts = current_user.contacts.includes(:person => :profile) + @contact_count = current_user.contacts.count @aspect = :all unless params[:a_ids] @aspect ||= @aspects.first #used in mobile diff --git a/app/views/aspects/_aspect_listings.haml b/app/views/aspects/_aspect_listings.haml index a5ffe04da..836bd6636 100644 --- a/app/views/aspects/_aspect_listings.haml +++ b/app/views/aspects/_aspect_listings.haml @@ -6,7 +6,7 @@ %h4 .right - = link_to t('contacts', :count => contacts.count), aspects_manage_path, :title => t('aspects.manage.manage_aspects') + = link_to t('contacts', :count => @contact_count), aspects_manage_path, :title => t('aspects.manage.manage_aspects') = aspects.count - if aspects.count == 1 diff --git a/app/views/aspects/index.html.haml b/app/views/aspects/index.html.haml index 64bc11860..24ef5199a 100644 --- a/app/views/aspects/index.html.haml +++ b/app/views/aspects/index.html.haml @@ -8,7 +8,7 @@ .span-15.append-2 - = render 'aspects/no_contacts_message', :aspect => @aspect, :contact_count => @contacts.count + = render 'aspects/no_contacts_message', :aspect => @aspect, :contact_count => @contact_count #aspect_stream_container = render 'aspect_stream', @@ -45,7 +45,7 @@ #aspect_listings.section - = render 'aspects/aspect_listings', :aspects => @aspects, :contacts => @contacts + = render 'aspects/aspect_listings', :aspects => @aspects - if @invites <= 0 .section.invite_friends diff --git a/app/views/aspects/index.js.erb b/app/views/aspects/index.js.erb index 93b55decd..8e1bf9dd6 100644 --- a/app/views/aspects/index.js.erb +++ b/app/views/aspects/index.js.erb @@ -1,5 +1,5 @@ $('#aspect_stream_container').html("<%= escape_javascript(render('aspects/aspect_stream', :aspect => @aspect, :aspect_ids => @aspect_ids, :posts => @posts, :fakes => @fakes)) %>"); -$('#aspect_listings').html("<%= escape_javascript(render('aspects/aspect_listings', :aspects => @aspects, :contacts => @contacts)) %>"); +$('#aspect_listings').html("<%= escape_javascript(render('aspects/aspect_listings', :aspects => @aspects)) %>"); $('a[rel*=facebox]').facebox(); $(document).ready(function() { diff --git a/spec/controllers/aspects_controller_spec.rb b/spec/controllers/aspects_controller_spec.rb index d060e614c..7db3811bf 100644 --- a/spec/controllers/aspects_controller_spec.rb +++ b/spec/controllers/aspects_controller_spec.rb @@ -53,10 +53,6 @@ describe AspectsController do end describe "#index" do - it "assigns @contacts to all the user's contacts" do - get :index - assigns[:contacts].map{|c| c.id}.should == @user.contacts.map{|c| c.id} - end it "generates a jasmine fixture" do get :index save_fixture(html_for("body"), "aspects_index")