From 9f9f60106e8e65a5fd7ba5c979e87c03413518f1 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Wed, 18 Sep 2013 10:06:14 +0100 Subject: Restrict old_unclassified methods to normal prominence. Fixes #1082. --- app/models/info_request.rb | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'app/models/info_request.rb') diff --git a/app/models/info_request.rb b/app/models/info_request.rb index 9bce2ca88..14eead6ad 100644 --- a/app/models/info_request.rb +++ b/app/models/info_request.rb @@ -958,11 +958,21 @@ 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 count(:all, params) end - def InfoRequest.get_random_old_unclassified(limit) + 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 params[:limit] = limit params[:order] = "random()" find(:all, params) -- cgit v1.2.3