From 8927824478ddac22c7dd8239ed5586031847ab04 Mon Sep 17 00:00:00 2001
From: Matthew Landauer <matthew@openaustralia.org>
Date: Tue, 12 Feb 2013 12:40:52 +1100
Subject: Simplify param_exists method

---
 app/controllers/application_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/controllers/application_controller.rb')

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index ed1523f75..289f51b20 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -457,7 +457,7 @@ class ApplicationController < ActionController::Base
     end
 
     def param_exists(item)
-        return params[item] && !params[item].empty?
+        params.has_key?(item)
     end
 
     def get_request_variety_from_params
-- 
cgit v1.2.3


From c4ee8fc6aeba6f1bb6eaad161c7bbc766a19e4d1 Mon Sep 17 00:00:00 2001
From: Matthew Landauer <matthew@openaustralia.org>
Date: Tue, 12 Feb 2013 12:42:27 +1100
Subject: Inline method

---
 app/controllers/application_controller.rb | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'app/controllers/application_controller.rb')

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 289f51b20..e149d2de7 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -456,10 +456,6 @@ class ApplicationController < ActionController::Base
         end
     end
 
-    def param_exists(item)
-        params.has_key?(item)
-    end
-
     def get_request_variety_from_params
         query = ""
         sortby = "newest"
@@ -519,13 +515,13 @@ class ApplicationController < ActionController::Base
 
     def get_date_range_from_params
         query = ""
-        if param_exists(:request_date_after) && !param_exists(:request_date_before)
+        if params.has_key?(:request_date_after) && !params.has_key?(:request_date_before)
             params[:request_date_before] = Time.now.strftime("%d/%m/%Y")
             query += " #{params[:request_date_after]}..#{params[:request_date_before]}"
-        elsif !param_exists(:request_date_after) && param_exists(:request_date_before)
+        elsif !params.has_key?(:request_date_after) && params.has_key?(:request_date_before)
             params[:request_date_after] = "01/01/2001"
         end
-        if param_exists(:request_date_after)
+        if params.has_key?(:request_date_after)
             query = " #{params[:request_date_after]}..#{params[:request_date_before]}"
         end
         return query
@@ -534,7 +530,7 @@ class ApplicationController < ActionController::Base
     def get_tags_from_params
         query = ""
         tags = []
-        if param_exists(:tags)
+        if params.has_key?(:tags)
             params[:tags].split().each do |tag|
                 tags << "tag:#{tag}"
             end
-- 
cgit v1.2.3


From 2eadcc3417b11237f9e40dd5eb5804b2fcc44c82 Mon Sep 17 00:00:00 2001
From: Matthew Landauer <matthew@openaustralia.org>
Date: Tue, 12 Feb 2013 12:53:30 +1100
Subject: Pass parameters to method rather explicitly

---
 app/controllers/application_controller.rb | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'app/controllers/application_controller.rb')

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
 
-- 
cgit v1.2.3