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

eager loading aspect memberships

Browse source
This commit is contained in:
danielgrippi 2011-05-13 18:22:42 -07:00
parent 30796de400
commit a02b9c01c8
5 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/aspects_controller.rb
View file

@ -112,12 +112,12 @@ class AspectsController < ApplicationController
def edit def edit
@aspect = current_user.aspects.where(:id => params[:id]).includes(:contacts => {:person => :profile}).first @aspect = current_user.aspects.where(:id => params[:id]).includes(:contacts => {:person => :profile}).first
@contacts_in_aspect = @aspect.contacts.includes(:person => :profile).all.sort! { |x, y| x.person.name <=> y.person.name } @contacts_in_aspect = @aspect.contacts.includes(:aspect_memberships, :person => :profile).all.sort! { |x, y| x.person.name <=> y.person.name }
c = Contact.arel_table c = Contact.arel_table
if @contacts_in_aspect.empty? if @contacts_in_aspect.empty?
@contacts_not_in_aspect = current_user.contacts.receiving.includes(:person => :profile).all.sort! { |x, y| x.person.name <=> y.person.name } @contacts_not_in_aspect = current_user.contacts.receiving.includes(:aspect_memberships, :person => :profile).all.sort! { |x, y| x.person.name <=> y.person.name }
else else
@contacts_not_in_aspect = current_user.contacts.receiving.where(c[:id].not_in(@contacts_in_aspect.map(&:id))).includes(:person => :profile).all.sort! { |x, y| x.person.name <=> y.person.name } @contacts_not_in_aspect = current_user.contacts.receiving.where(c[:id].not_in(@contacts_in_aspect.map(&:id))).includes(:aspect_memberships, :person => :profile).all.sort! { |x, y| x.person.name <=> y.person.name }
end end
@contacts = @contacts_in_aspect + @contacts_not_in_aspect @contacts = @contacts_in_aspect + @contacts_not_in_aspect

2
app/controllers/contacts_controller.rb
View file

@ -37,7 +37,7 @@ class ContactsController < ApplicationController
end end
def sharing def sharing
@contacts = current_user.contacts.sharing.includes(:aspects) @contacts = current_user.contacts.sharing.includes(:aspect_memberships)
render :layout => false render :layout => false
end end
end end

2
app/helpers/aspect_global_helper.rb
View file

@ -83,7 +83,7 @@ module AspectGlobalHelper
end end
def aspect_dropdown_list_item(aspect, contact, person) def aspect_dropdown_list_item(aspect, contact, person)
checked = contact.persisted? && contact.aspects.include?(aspect) ? "checked=\"checked\"" : "" checked = (contact.persisted? && contact.aspect_memberships.detect{ |am| am.aspect_id == aspect.id}) ? "checked=\"checked\"" : ""
str = "<li data-aspect_id=#{aspect.id}>" str = "<li data-aspect_id=#{aspect.id}>"
str << "<input #{checked} id=\"in_aspect\" name=\"in_aspect\" type=\"checkbox\" value=\"in_aspect\" />" str << "<input #{checked} id=\"in_aspect\" name=\"in_aspect\" type=\"checkbox\" value=\"in_aspect\" />"
str << aspect.name str << aspect.name

2
app/helpers/aspects_helper.rb
View file

@ -39,7 +39,7 @@ module AspectsHelper
end end
def aspect_membership_button(aspect, contact, person) def aspect_membership_button(aspect, contact, person)
if contact.nil? || !aspect.contacts.include?(contact) if contact.nil? || !contact.aspect_memberships.detect{ |am| am.aspect_id == aspect.id}
add_to_aspect_button(aspect.id, person.id) add_to_aspect_button(aspect.id, person.id)
else else
remove_from_aspect_button(aspect.id, person.id) remove_from_aspect_button(aspect.id, person.id)

6
spec/controllers/aspects_controller_spec.rb
View file

@ -352,6 +352,12 @@ describe AspectsController do
get :edit, :id => alices_aspect_3.id get :edit, :id => alices_aspect_3.id
assigns[:contacts].map(&:id).should == [alice.contact_for(bob.person), alice.contact_for(eve.person), alice.contact_for(@katz.person), alice.contact_for(@zed.person)].map(&:id) assigns[:contacts].map(&:id).should == [alice.contact_for(bob.person), alice.contact_for(eve.person), alice.contact_for(@katz.person), alice.contact_for(@zed.person)].map(&:id)
end end
it 'eager loads the aspect memberships for all the contacts' do
get :edit, :id => @alices_aspect_2.id
pp assigns[:contacts].count
assigns[:contacts].each{ |c| pp @alices_aspect_2.contacts.include?(c); c.aspect_memberships.loaded?.should be_true}
end
end end
describe "#toggle_contact_visibility" do describe "#toggle_contact_visibility" do