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

Fix contact count displayed on the right for good. Also use only one randomization when selecting the random contacts to display.

Browse source
This commit is contained in:
Andrej Kacian 2011-08-12 22:04:53 +02:00
parent 7e901d0220
commit 1062cc5bf6
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/aspects_controller.rb
View file

@ -32,7 +32,7 @@ class AspectsController < ApplicationController
all_selected_people = Person.joins(:contacts => :aspect_memberships). all_selected_people = Person.joins(:contacts => :aspect_memberships).
where(:contacts => {:user_id => current_user.id}, where(:contacts => {:user_id => current_user.id},
:aspect_memberships => {:aspect_id => aspect_ids}) :aspect_memberships => {:aspect_id => aspect_ids})
@selected_people = all_selected_people.select("DISTINCT people.*").order('RAND()').limit(20).includes(:profile) @selected_people = all_selected_people.select("DISTINCT people.*").includes(:profile)
end end
@aspect_ids = @aspects.map { |a| a.id } @aspect_ids = @aspects.map { |a| a.id }
@ -45,7 +45,7 @@ class AspectsController < ApplicationController
if params[:only_posts] if params[:only_posts]
render :partial => 'shared/stream', :locals => {:posts => @posts} render :partial => 'shared/stream', :locals => {:posts => @posts}
else else
@contact_count = all_selected_people.count @contact_count = @selected_people.count
@aspect = :all unless params[:a_ids] @aspect = :all unless params[:a_ids]
@aspect ||= @aspects.first # used in mobile @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)) %>"); $('#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 => @contact_count )) %>"); $('#selected_aspect_contacts').html("<%= escape_javascript(render('aspects/selected_contacts', :people => @selected_people.sample(20), :count => @contact_count )) %>");
$('#aspect_stream_container a[rel*=facebox]').facebox(); $('#aspect_stream_container a[rel*=facebox]').facebox();