github/diaspora
1
1
Fork 0
mirror of https://github.com/diaspora/diaspora.git synced 2026-01-09 15:18:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

clean up Person scopes, and re-use one in contact controller to deprecate a controller method

Browse Source
This commit is contained in:
Maxwell Salzberg
2012-01-27 02:02:18 -08:00
parent 7cef6a8d22
commit c100f8bfdd
5 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/controllers/contacts_controller.rb
View File

@@ -19,17 +19,14 @@ class ContactsController < ApplicationController
current_user.contacts.receiving
end
end
@contacts = @contacts.for_a_stream(params[:page])
respond_to do |format|
format.html { @contacts = sort_and_paginate_profiles(@contacts) }
format.mobile { @contacts = sort_and_paginate_profiles(@contacts) }
format.json {
@people = Person.for_json.joins(:contacts => :aspect_memberships).
where(:contacts => { :user_id => current_user.id },
:aspect_memberships => { :aspect_id => params[:aspect_ids] })
@people = Person.all_from_aspects(params[:aspect_ids], current_user).for_json
render :json => @people.to_json
}
format.any{}
end
end
@@ -43,12 +40,4 @@ class ContactsController < ApplicationController
@people = Person.community_spotlight
end
private
def sort_and_paginate_profiles contacts
contacts.
includes(:aspects, :person => :profile).
order('profiles.last_name ASC').
paginate(:page => params[:page], :per_page => 25)
end
end