Refactor contacts#index to have explicit html and mobile formats again, because apparently infinite scroll wants the html version, not the json version.
This commit is contained in:
parent
a27b17bc68
commit
03e3d8e993
1 changed files with 23 additions and 17 deletions
|
|
@ -8,28 +8,15 @@ class ContactsController < ApplicationController
|
|||
def index
|
||||
respond_to do |format|
|
||||
|
||||
format.html { set_up_contacts }
|
||||
|
||||
format.mobile { set_up_contacts }
|
||||
|
||||
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
|
||||
when "all"
|
||||
current_user.contacts
|
||||
else
|
||||
if params[:a_id]
|
||||
@aspect = current_user.aspects.find(params[:a_id])
|
||||
@aspect.contacts
|
||||
else
|
||||
current_user.contacts.receiving
|
||||
end
|
||||
end
|
||||
@contacts = @contacts.for_a_stream.paginate(:page => params[:page], :per_page => 25)
|
||||
}
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -43,4 +30,23 @@ class ContactsController < ApplicationController
|
|||
@people = Person.community_spotlight
|
||||
end
|
||||
|
||||
protected
|
||||
|
||||
def set_up_contacts
|
||||
@contacts = case params[:set]
|
||||
when "only_sharing"
|
||||
current_user.contacts.only_sharing
|
||||
when "all"
|
||||
current_user.contacts
|
||||
else
|
||||
if params[:a_id]
|
||||
@aspect = current_user.aspects.find(params[:a_id])
|
||||
@aspect.contacts
|
||||
else
|
||||
current_user.contacts.receiving
|
||||
end
|
||||
end
|
||||
@contacts = @contacts.for_a_stream.paginate(:page => params[:page], :per_page => 25)
|
||||
end
|
||||
|
||||
end
|
||||
|
|
|
|||
Loading…
Reference in a new issue