Skip to content
Extraits de code Groupes Projets
Valider 63590e2e rédigé par zhitomirskiyi's avatar zhitomirskiyi
Parcourir les fichiers

restore hashes for person for person#index. since request relations are one...

restore hashes for person for person#index.  since request relations are one way, the building the hash is perhaps simpler than alternitives"
parent ef1b7644
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
......@@ -16,6 +16,7 @@ class PeopleController < ApplicationController
redirect_to @people.first
else
@hashes = hashes_for_people(@people, @aspects)
@people
#only do it if it is an email address
if params[:q].try(:match, Devise.email_regexp)
webfinger(params[:q])
......@@ -23,6 +24,25 @@ class PeopleController < ApplicationController
end
end
def hashes_for_people people, aspects
ids = people.map{|p| p.id}
requests = {}
Request.where(:sender_id => ids, :recipient_id => current_user.person.id).each do |r|
requests[r.id] = r
end
contacts = {}
Contact.where(:user_id => current_user.id, :person_id => ids).each do |contact|
contacts[contact.person_id] = contact
end
people.map{|p|
{:person => p,
:contact => contacts[p.id],
:request => requests[p.id],
:aspects => aspects}
}
end
def show
@person = Person.where(:id => params[:id]).first
@post_type = :all
......@@ -115,5 +135,4 @@ class PeopleController < ApplicationController
def webfinger(account, opts = {})
Resque.enqueue(Jobs::SocketWebfinger, current_user.id, account, opts)
end
end
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