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

ignore searchable if one searches by handle in people#index

Browse source
This commit is contained in:
MrZYX 2011-05-29 22:58:33 +02:00
parent 502f467012
commit 3db4772652
2 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/controllers/people_controller.rb
View file

@ -26,13 +26,15 @@ class PeopleController < ApplicationController
end
format.all do
@people = Person.search(params[:q], current_user).paginate :page => params[:page], :per_page => limit
@hashes = hashes_for_people(@people, @aspects)
#only do it if it is an email address
if params[:q].try(:match, Devise.email_regexp)
webfinger(params[:q])
people = Person.where(:diaspora_handle => params[:q])
else
people = Person.search(params[:q], current_user)
end
@people = people.paginate :page => params[:page], :per_page => limit
@hashes = hashes_for_people(@people, @aspects)
end
end
end

18
spec/controllers/people_controller_spec.rb
View file

@ -42,6 +42,22 @@ describe PeopleController do
assigns[:people].should =~ [@eugene, eugene2]
end
it "excludes people that are not searchable" do
eugene2 = Factory.create(:person,
:profile => Factory.build(:profile, :first_name => "Eugene",
:last_name => "w", :searchable => false))
get :index, :q => "Eug"
assigns[:people].should_not =~ [eugene2]
end
it "allows unsearchable people to be found by handle" do
eugene2 = Factory.create(:person, :diaspora_handle => "eugene@example.org",
:profile => Factory.build(:profile, :first_name => "Eugene",
:last_name => "w", :searchable => false))
get :index, :q => "eugene@example.org"
assigns[:people].should =~ [eugene2]
end
it "does not redirect to person page if there is exactly one match" do
get :index, :q => "Korth"
response.should_not redirect_to @korth
@ -268,4 +284,4 @@ describe PeopleController do
get :retrieve_remote, :diaspora_handle => @user.diaspora_handle
end
end
end
end