Skip to content
Extraits de code Groupes Projets
Valider 1062cc5b rédigé par Andrej Kacian's avatar Andrej Kacian
Parcourir les fichiers

Fix contact count displayed on the right for good. Also use only one...

Fix contact count displayed on the right for good. Also use only one randomization when selecting the random contacts to display.
parent 7e901d02
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
......@@ -32,7 +32,7 @@ class AspectsController < ApplicationController
all_selected_people = Person.joins(:contacts => :aspect_memberships).
where(:contacts => {:user_id => current_user.id},
: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
@aspect_ids = @aspects.map { |a| a.id }
......@@ -45,7 +45,7 @@ class AspectsController < ApplicationController
if params[:only_posts]
render :partial => 'shared/stream', :locals => {:posts => @posts}
else
@contact_count = all_selected_people.count
@contact_count = @selected_people.count
@aspect = :all unless params[:a_ids]
@aspect ||= @aspects.first # used in mobile
......
$('#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();
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter