Pass parameters to method rather explicitly

4 files changed, 13 insertions, 13 deletions

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index e149d2de7..f3deeb64a 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -456,7 +456,7 @@ class ApplicationController < ActionController::Base
         end
     end
 
-    def get_request_variety_from_params
+    def get_request_variety_from_params(params)
         query = ""
         sortby = "newest"
         varieties = []
@@ -478,7 +478,7 @@ class ApplicationController < ActionController::Base
         return query
     end
 
-    def get_status_from_params
+    def get_status_from_params(params)
         query = ""
         if params[:latest_status]
             statuses = []
@@ -513,7 +513,7 @@ class ApplicationController < ActionController::Base
         return query
     end
 
-    def get_date_range_from_params
+    def get_date_range_from_params(params)
         query = ""
         if params.has_key?(:request_date_after) && !params.has_key?(:request_date_before)
             params[:request_date_before] = Time.now.strftime("%d/%m/%Y")
@@ -527,7 +527,7 @@ class ApplicationController < ActionController::Base
         return query
     end
 
-    def get_tags_from_params
+    def get_tags_from_params(params)
         query = ""
         tags = []
         if params.has_key?(:tags)
@@ -541,12 +541,12 @@ class ApplicationController < ActionController::Base
         return query
     end
 
-    def make_query_from_params
+    def make_query_from_params(params)
         query = params[:query] || "" if query.nil?
-        query += get_date_range_from_params
-        query += get_request_variety_from_params
-        query += get_status_from_params
-        query += get_tags_from_params
+        query += get_date_range_from_params(params)
+        query += get_request_variety_from_params(params)
+        query += get_status_from_params(params)
+        query += get_tags_from_params(params)
         return query
     end
 
diff --git a/app/controllers/general_controller.rb b/app/controllers/general_controller.rb
index 875e39494..a8bbc22ff 100644
--- a/app/controllers/general_controller.rb
+++ b/app/controllers/general_controller.rb
@@ -151,10 +151,10 @@ class GeneralController < ApplicationController
             params[:query] = @query
         end
         if @variety_postfix != "all" && @requests
-            @query, _ = make_query_from_params
+            @query, _ = make_query_from_params(params)
         end
         @inputted_sortby = @sortby
-        @common_query = get_tags_from_params
+        @common_query = get_tags_from_params(params)
         if @sortby.nil?
             # Parse query, so can work out if it has prefix terms only - if so then it is a
             # structured query which should show newest first, rather than a free text search
diff --git a/app/controllers/public_body_controller.rb b/app/controllers/public_body_controller.rb
index 8a4a65820..d88ab66e3 100644
--- a/app/controllers/public_body_controller.rb
+++ b/app/controllers/public_body_controller.rb
@@ -40,7 +40,7 @@ class PublicBodyController < ApplicationController
             @view = params[:view]
             params[:latest_status] = @view
 
-            query = make_query_from_params
+            query = make_query_from_params(params)
             query += " requested_from:#{@public_body.url_name}"
             # Use search query for this so can collapse and paginate easily
             # XXX really should just use SQL query here rather than Xapian.
diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb
index dfa3a4834..184441e06 100644
--- a/app/controllers/request_controller.rb
+++ b/app/controllers/request_controller.rb
@@ -175,7 +175,7 @@ class RequestController < ApplicationController
         end
 
         params[:latest_status] = @view
-        query = make_query_from_params
+        query = make_query_from_params(params)
         @title = _("View and search requests")
         sortby = "newest"
         xapian_object = perform_search([InfoRequestEvent], query, sortby, 'request_collapse')