nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1703 from ticho/fix-right-bar-target-contact-count

Browse source 
Show correct contact count in right bar when changing target aspect.
This commit is contained in:
ticho 2011-08-11 14:09:34 -07:00
commit d63251e6a8
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/aspects_controller.rb
View file

@ -45,7 +45,7 @@ class AspectsController < ApplicationController
if params[:only_posts]
render :partial => 'shared/stream', :locals => {:posts => @posts}
else
@contact_count = current_user.contacts.receiving.count
@contact_count = all_selected_people.count
@aspect = :all unless params[:a_ids]
@aspect ||= @aspects.first # used in mobile

2
app/views/aspects/index.js.erb
View file

@ -1,3 +1,3 @@
$('#aspect_stream_container').html("<%= escape_javascript(render('aspects/aspect_stream', :aspect => @aspect, :aspect_ids => @aspect_ids, :posts => @posts)) %>");
$('#selected_aspect_contacts').html("<%= escape_javascript(render('aspects/selected_contacts', :people => @selected_people[0..19], :count => @selected_people.size )) %>");
$('#selected_aspect_contacts').html("<%= escape_javascript(render('aspects/selected_contacts', :people => @selected_people[0..19], :count => @contact_count )) %>");
$('#aspect_stream_container a[rel*=facebox]').facebox();