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

Slight refactor to contacts#index

Browse source
This commit is contained in:
Sarah Mei 2012-01-28 15:00:27 -08:00
parent 2d98c57cf1
commit a27b17bc68
1 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/controllers/contacts_controller.rb
View file

@ -6,6 +6,15 @@ class ContactsController < ApplicationController
before_filter :authenticate_user!
def index
respond_to do |format|
format.json {
aspect_ids = params[:aspect_ids] || current_user.aspects.map(&:id)
@people = Person.all_from_aspects(aspect_ids, current_user).for_json.paginate(:page => params[:page], :per_page => 25)
render :json => @people.to_json
}
format.any {
@contacts = case params[:set]
when "only_sharing"
current_user.contacts.only_sharing
@ -20,14 +29,7 @@ class ContactsController < ApplicationController
end
end
@contacts = @contacts.for_a_stream.paginate(:page => params[:page], :per_page => 25)
respond_to do |format|
format.json {
aspect_ids = params[:aspect_ids] || current_user.aspects.map(&:id)
@people = Person.all_from_aspects(aspect_ids, current_user).for_json.paginate(:page => params[:page], :per_page => 25)
render :json => @people.to_json
}
format.any{}
end
end