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

Correct limit on search autocomplete

Browse source
This commit is contained in:
Raphael 2011-02-01 14:35:14 -08:00
parent 423cd7807b
commit bbe47fbb55
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/controllers/people_controller.rb
View file

@ -11,8 +11,9 @@ class PeopleController < ApplicationController
def index def index
@aspect = :search @aspect = :search
params[:q] ||= params[:term] params[:q] ||= params[:term]
limit = params[:limit] || 15
@people = Person.search(params[:q], current_user).paginate :page => params[:page], :per_page => 15 @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)
#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)

4
public/javascripts/search.js
View file

@ -25,7 +25,9 @@ var Search = {
}, },
options : function(){return { options : function(){return {
minChars : 3, minChars : 3,
max : 4, max : 5,
scroll : false,
extraParams : {limit : 4},
formatItem : Search.formatItem, formatItem : Search.formatItem,
formatResult : Search.formatResult, formatResult : Search.formatResult,
parse : Search.parse, parse : Search.parse,