diff options
| author | Louise Crow <louise.crow@gmail.com> | 2014-01-29 16:10:52 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2014-01-29 16:10:52 +0000 |
| commit | 184ffeccb7f4579b481db9b7744aa9baed70562f (patch) | |
| tree | 67c023b029a699a1e727ef6becdc0832e82ea1c5 /app/controllers/application_controller.rb | |
| parent | e44c8b875fd4ad46b954ef9c31bdb6f0366dcb9e (diff) | |
| parent | 79b2f672aeae394a2c195d89b70bda27bb3201a4 (diff) | |
Merge branch 'feature/batch-requests' into rails-3-develop
Conflicts:
config/general.yml-example
spec/factories.rb
Diffstat (limited to 'app/controllers/application_controller.rb')
| -rw-r--r-- | app/controllers/application_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 7c122917d..370e8e15c 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -369,9 +369,9 @@ class ApplicationController < ActionController::Base return page end - def perform_search_typeahead(query, model) + def perform_search_typeahead(query, model, per_page=25) @page = get_search_page_from_params - @per_page = 10 + @per_page = per_page query_words = query.split(/ +(?![-+]+)/) if query_words.last.nil? || query_words.last.strip.length < 3 xapian_requests = nil |