diff options
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/application.rb | 6 | ||||
| -rw-r--r-- | app/controllers/general_controller.rb | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/app/controllers/application.rb b/app/controllers/application.rb index c92e084a7..a7ed76772 100644 --- a/app/controllers/application.rb +++ b/app/controllers/application.rb @@ -6,7 +6,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: application.rb,v 1.33 2008-04-01 00:36:56 francis Exp $ +# $Id: application.rb,v 1.34 2008-04-01 05:43:40 francis Exp $ class ApplicationController < ActionController::Base @@ -125,7 +125,7 @@ class ApplicationController < ActionController::Base end # Function for search - def perform_search(query, sortby) + def perform_search(query, sortby, per_page = 25) @query = query @sortby = sortby @@ -141,7 +141,7 @@ class ApplicationController < ActionController::Base end # Peform the search - @per_page = 20 + @per_page = per_page @page = (params[:page] || "1").to_i solr_object = InfoRequestEvent.multi_solr_search(@query, :models => [ PublicBody, User ], diff --git a/app/controllers/general_controller.rb b/app/controllers/general_controller.rb index 6930b1ddd..21450fddc 100644 --- a/app/controllers/general_controller.rb +++ b/app/controllers/general_controller.rb @@ -5,7 +5,7 @@ # Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: general_controller.rb,v 1.15 2008-04-01 00:36:56 francis Exp $ +# $Id: general_controller.rb,v 1.16 2008-04-01 05:43:40 francis Exp $ class GeneralController < ApplicationController @@ -33,7 +33,9 @@ class GeneralController < ApplicationController end # Get all successful requests for display on the right - @info_requests = InfoRequest.find :all, :order => "created_at desc", :conditions => "prominence = 'normal' and described_state in ('successful', 'partially_successful')", :limit => 3 + query = 'variety:response (status:successful OR status:partially_successful)' + sortby = "newest" + perform_search(query, sortby, 3) end |