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

Fix infinite scroll on search... some kind of weird thing with rails responding with json even when request.format is html, with a mime type of html

Browse source
This commit is contained in:
Raphael Sofaer 2011-08-13 09:59:17 -07:00
parent f60ce932b1
commit 3a18044821
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/controllers/people_controller.rb
View file

@ -30,7 +30,18 @@ class PeopleController < ApplicationController
render :json => @people
end
format.all do
format.html do
#only do it if it is an email address
if params[:q].try(:match, Devise.email_regexp)
people = Person.where(:diaspora_handle => params[:q])
webfinger(params[:q]) if people.empty?
else
people = Person.search(params[:q], current_user)
end
@people = people.paginate( :page => params[:page], :per_page => 15)
@hashes = hashes_for_people(@people, @aspects)
end
format.mobile do
#only do it if it is an email address
if params[:q].try(:match, Devise.email_regexp)
people = Person.where(:diaspora_handle => params[:q])
@ -68,7 +79,7 @@ class PeopleController < ApplicationController
@person = Person.find_from_id_or_username(params)
if remote_profile_with_no_user_session?
raise ActiveRecord::RecordNotFound
raise ActiveRecord::RecordNotFound
end
@post_type = :all