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

Join two aspect_ids calculations into one

Browse source
This commit is contained in:
Gonzalo Rodriguez 2011-09-06 23:12:03 -03:00
parent b38cf47661
commit 4a2b609d53
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/controllers/aspects_controller.rb
View file

@ -20,22 +20,21 @@ class AspectsController < ApplicationController
@aspects = current_user.aspects @aspects = current_user.aspects
end end
aspect_ids = @aspects.map{|a| a.id}
# redirect to aspects creation # redirect to aspects creation
if @aspects.blank? if @aspects.blank?
redirect_to new_aspect_path redirect_to new_aspect_path
return return
end end
@aspect_ids = @aspects.map { |a| a.id }
unless params[:only_posts] unless params[:only_posts]
all_selected_people = Person.joins(:contacts => :aspect_memberships). all_selected_people = Person.joins(:contacts => :aspect_memberships).
where(:contacts => {:user_id => current_user.id}, where(:contacts => {:user_id => current_user.id},
:aspect_memberships => {:aspect_id => aspect_ids}) :aspect_memberships => {:aspect_id => @aspect_ids})
@selected_people = all_selected_people.select("DISTINCT people.*").includes(:profile) @selected_people = all_selected_people.select("DISTINCT people.*").includes(:profile)
end end
@aspect_ids = @aspects.map { |a| a.id }
@posts = current_user.visible_posts(:by_members_of => @aspect_ids, @posts = current_user.visible_posts(:by_members_of => @aspect_ids,
:type => ['StatusMessage','Reshare', 'ActivityStreams::Photo'], :type => ['StatusMessage','Reshare', 'ActivityStreams::Photo'],
:order => session[:sort_order] + ' DESC', :order => session[:sort_order] + ' DESC',