Merge remote-tracking branch 'jpmckinney_github/extract_method' into rails-3-develop

1 files changed, 11 insertions, 15 deletions

diff --git a/app/models/info_request.rb b/app/models/info_request.rb
index fe3aec680..bef5d1893 100644
--- a/app/models/info_request.rb
+++ b/app/models/info_request.rb
@@ -1018,21 +1018,13 @@ public
 
     def InfoRequest.count_old_unclassified(extra_params={})
         params = old_unclassified_params(extra_params)
-        if extra_params[:conditions]
-            condition_string = extra_params[:conditions].shift
-            params[:conditions][0] += " AND #{condition_string}"
-            params[:conditions] += extra_params[:conditions]
-        end
+        add_conditions_from_extra_params(params, extra_params)
         count(:all, params)
     end
 
     def InfoRequest.get_random_old_unclassified(limit, extra_params)
         params = old_unclassified_params({})
-        if extra_params[:conditions]
-            condition_string = extra_params[:conditions].shift
-            params[:conditions][0] += " AND #{condition_string}"
-            params[:conditions] += extra_params[:conditions]
-        end
+        add_conditions_from_extra_params(params, extra_params)
         params[:limit] = limit
         params[:order] = "random()"
         find(:all, params)
@@ -1047,11 +1039,7 @@ public
             params[:order] = extra_params[:order]
             params.delete(:select)
         end
-        if extra_params[:conditions]
-            condition_string = extra_params[:conditions].shift
-            params[:conditions][0] += " AND #{condition_string}"
-            params[:conditions] += extra_params[:conditions]
-        end
+        add_conditions_from_extra_params(params, extra_params)
         find(:all, params)
     end
 
@@ -1432,5 +1420,13 @@ public
             errors.add(:title, _('Please describe more what the request is about in the subject. There is no need to say it is an FOI request, we add that on anyway.'))
         end
     end
+
+    def self.add_conditions_from_extra_params(params, extra_params)
+        if extra_params[:conditions]
+            condition_string = extra_params[:conditions].shift
+            params[:conditions][0] += " AND #{condition_string}"
+            params[:conditions] += extra_params[:conditions]
+        end
+    end
 end