aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFOI archive email account <foi@sandwich.ukcod.org.uk>2009-11-28 00:28:50 +0000
committerFOI archive email account <foi@sandwich.ukcod.org.uk>2009-11-28 00:28:50 +0000
commitd889e77d2cdd7a75f80c024634e4779b7760c10d (patch)
tree960284233a8c2c7e386ce5a8ac7b651f9c40e1d7
parent50f9cf1e6ddb10af93c908f153dbd18bc0e7bbaf (diff)
parenta6a8c74b9e5c2f108c6aefc97c66aecb67d95e9b (diff)
Merge branch 'master' of git://git.mysociety.org/whatdotheyknow
-rw-r--r--app/controllers/general_controller.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/general_controller.rb b/app/controllers/general_controller.rb
index 44c2507ec..bb56a9f49 100644
--- a/app/controllers/general_controller.rb
+++ b/app/controllers/general_controller.rb
@@ -120,7 +120,8 @@ class GeneralController < ApplicationController
# Query each type separately for separate display (XXX we are calling
# perform_search multiple times and it clobbers per_page for each one,
# so set as separate var)
- @xapian_requests = perform_search([InfoRequestEvent], @query, @sortby, 'request_collapse', 25)
+ requests_per_page = params[:requests_per_page].to_i || 25;
+ @xapian_requests = perform_search([InfoRequestEvent], @query, @sortby, 'request_collapse', requests_per_page)
@requests_per_page = @per_page
@xapian_bodies = perform_search([PublicBody], @query, @sortby, nil, 5)
@bodies_per_page = @per_page