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

Try taking out some contact loading again

Browse source
This commit is contained in:
Raphael Sofaer 2011-07-02 14:43:15 -07:00
parent 6b46d69b65
commit 86c06c4d15
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/controllers/aspects_controller.rb
View file

@ -20,9 +20,6 @@ class AspectsController < ApplicationController
aspect_ids = @aspects.map{|a| a.id}
#No aspect_listings on infinite scroll
@aspects = @aspects.includes(:contacts => {:person => :profile}) unless params[:only_posts]
# redirect to signup
if (current_user.getting_started == true || @aspects.blank?) && !request.format.mobile? && !request.format.js?
redirect_to getting_started_path
@ -33,7 +30,7 @@ class AspectsController < ApplicationController
all_selected_contacts = Contact.joins(:aspect_memberships).
where(:aspect_memberships => {:aspect_id => aspect_ids})
@selected_contacts_count = all_selected_contacts.count
@selected_contacts = all_selected_contacts
@selected_contacts = all_selected_contacts.includes(:person => :profile)
end
@aspect_ids = @aspects.map { |a| a.id }