diff options
| author | David Cabo <david@calibea.com> | 2011-09-03 15:00:41 +0200 |
|---|---|---|
| committer | David Cabo <david@calibea.com> | 2011-09-03 15:00:41 +0200 |
| commit | aebe196100a231873099744ec33d1e4c7dc0934a (patch) | |
| tree | 79ea3ea950e762d120bba34b7c1346db07bc513d /app/controllers/user_controller.rb | |
| parent | 1741094c4ff2f8592e5be5c09ee914f37b39039e (diff) | |
| parent | 204e5c3a739a2bedf927b2f6aa82c373731bbda8 (diff) | |
Merge branch 'develop' of github.com:sebbacon/alaveteli into develop
Diffstat (limited to 'app/controllers/user_controller.rb')
| -rw-r--r-- | app/controllers/user_controller.rb | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index c53529bc3..96dbfba74 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -35,9 +35,16 @@ class UserController < ApplicationController # Use search query for this so can collapse and paginate easily # XXX really should just use SQL query here rather than Xapian. begin - @xapian_requests = perform_search([InfoRequestEvent], 'requested_by:' + @display_user.url_name, 'newest', 'request_collapse') - @xapian_comments = perform_search([InfoRequestEvent], 'commented_by:' + @display_user.url_name, 'newest', nil) - + requests_query = 'requested_by:' + @display_user.url_name + comments_query = 'commented_by:' + @display_user.url_name + if !params[:user_query].nil? + requests_query += " " + params[:user_query] + comments_query += " " + params[:user_query] + @match_phrase = _("{{search_results}} matching '{{query}}'", :search_results => "", :query => params[:user_query]) + end + @xapian_requests = perform_search([InfoRequestEvent], requests_query, 'newest', 'request_collapse') + @xapian_comments = perform_search([InfoRequestEvent], comments_query, 'newest', nil) + if (@page > 1) @page_desc = " (page " + @page.to_s + ")" else |