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

Simplify hashes_for_contacts

Browse source
This commit is contained in:
Raphael 2011-01-17 14:17:37 -08:00
parent 6410355d71
commit 4ba58d8132
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/controllers/aspects_controller.rb
View file

@ -83,7 +83,7 @@ class AspectsController < ApplicationController
render :file => "#{Rails.root}/public/404.html", :layout => false, :status => 404
else
@aspect_ids = [@aspect.id]
@aspect_contacts = hashes_for_contacts @aspect.contacts.where(:pending => false).all
@aspect_contacts = hashes_for_contacts @aspect.contacts.where(:pending => false)
@aspect_contacts_count = @aspect_contacts.count
@all_contacts = hashes_for_contacts @contacts
@ -187,10 +187,7 @@ class AspectsController < ApplicationController
private
def hashes_for_contacts contacts
people = Person.where(:id => contacts.map{|c| c.person_id})
people_hash = {}
people.each{|p| people_hash[p.id] = p}
contacts.map{|c| {:contact => c, :person => people_hash[c.person_id]}}
contacts.includes(:person).map{|c| {:contact => c, :person => c.person}}
end
def hashes_for_aspects aspects, contacts, opts = {}