Fix call to search in controller
This commit is contained in:
parent
971c88da5e
commit
4deec0cb38
1 changed files with 2 additions and 2 deletions
|
|
@ -11,12 +11,12 @@ class PeopleController < ApplicationController
|
||||||
def index
|
def index
|
||||||
@aspect = :search
|
@aspect = :search
|
||||||
|
|
||||||
@people = Person.search(params[:q]).paginate :page => params[:page], :per_page => 15, :order => 'created_at DESC'
|
@people = Person.search(params[:q], current_user).paginate :page => params[:page], :per_page => 15
|
||||||
if @people.count == 1
|
if @people.count == 1
|
||||||
redirect_to @people.first
|
redirect_to @people.first
|
||||||
else
|
else
|
||||||
@hashes = hashes_for_people(@people, @aspects)
|
@hashes = hashes_for_people(@people, @aspects)
|
||||||
@people
|
@people
|
||||||
#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])
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue