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

Don't call hashes_for_people if it is a json request in search

Browse source
This commit is contained in:
Raphael Sofaer 2011-02-09 16:05:02 -08:00
parent dbf1452968
commit 51e129b5c6
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/controllers/people_controller.rb
View file

@ -14,7 +14,8 @@ class PeopleController < ApplicationController
limit = params[:limit] || 15 limit = params[:limit] || 15
@people = Person.search(params[:q], current_user).paginate :page => params[:page], :per_page => limit @people = Person.search(params[:q], current_user).paginate :page => params[:page], :per_page => limit
@hashes = hashes_for_people(@people, @aspects) @hashes = hashes_for_people(@people, @aspects) unless request.format == :json
#only do it if it is an email address #only do it if it is an email address
if params[:q].try(:match, Devise.email_regexp) if params[:q].try(:match, Devise.email_regexp)
webfinger(params[:q]) webfinger(params[:q])

8
spec/controllers/people_controller_spec.rb
View file

@ -36,6 +36,14 @@ describe PeopleController do
get :index, :q => "Korth", :format => 'json' get :index, :q => "Korth", :format => 'json'
response.body.should == [@korth].to_json response.body.should == [@korth].to_json
end end
it 'does not set @hashes in a json request' do
get :index, :q => "Korth", :format => 'json'
assigns[:hashes].should be_nil
end
it 'sets @hashes in an html request' do
get :index, :q => "Korth"
assigns[:hashes].should_not be_nil
end
it "assigns people" do it "assigns people" do
eugene2 = Factory.create(:person, eugene2 = Factory.create(:person,
:profile => Factory.build(:profile, :first_name => "Eugene", :profile => Factory.build(:profile, :first_name => "Eugene",