Skip to content
Extraits de code Groupes Projets
Valider 5d64611f rédigé par Raphael Sofaer's avatar Raphael Sofaer Validation de root
Parcourir les fichiers

Include profile in contactsController index for the publisher

parent f60a748c
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -15,7 +15,7 @@ class ContactsController < ApplicationController ...@@ -15,7 +15,7 @@ class ContactsController < ApplicationController
@people = Person.joins(:contacts => :aspect_memberships). @people = Person.joins(:contacts => :aspect_memberships).
where(:contacts => {:user_id => current_user.id}, where(:contacts => {:user_id => current_user.id},
:aspect_memberships => {:aspect_id => params[:aspect_ids]}) :aspect_memberships => {:aspect_id => params[:aspect_ids]})
render :json => @people.to_json render :json => @people.includes(:profile).to_json
elsif params[:set] == "only_sharing" elsif params[:set] == "only_sharing"
@contacts = current_user.contacts.only_sharing.includes(:aspects, :person => :profile).order('profiles.last_name ASC').paginate(:page => params[:page], :per_page => 25) @contacts = current_user.contacts.only_sharing.includes(:aspects, :person => :profile).order('profiles.last_name ASC').paginate(:page => params[:page], :per_page => 25)
elsif params[:set] != "all" elsif params[:set] != "all"
......
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