aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2012-09-13 09:59:13 +0100
committerLouise Crow <louise.crow@gmail.com>2012-09-13 09:59:13 +0100
commit7d43d1a379175a7c200e32d6046d8f7c5d203ed9 (patch)
tree09f1ccf71417529235de05693ec8f99732c9bc05
parent9a504edc1a3312159441269c7da597fe78a0c430 (diff)
Allow InfoRequest.find_old_unclassified to accept an offset param so it can be used in conjunction with pagination.
-rw-r--r--app/models/info_request.rb5
-rw-r--r--spec/models/info_request_spec.rb8
2 files changed, 11 insertions, 2 deletions
diff --git a/app/models/info_request.rb b/app/models/info_request.rb
index ed54da840..2e16d0f58 100644
--- a/app/models/info_request.rb
+++ b/app/models/info_request.rb
@@ -977,8 +977,9 @@ public
def InfoRequest.find_old_unclassified(extra_params={})
params = old_unclassified_params(extra_params, include_last_response_time=true)
- params[:limit] = extra_params[:limit] if extra_params[:limit]
- params[:include] = extra_params[:include] if extra_params[:include]
+ [:limit, :include, :offset].each do |extra|
+ params[extra] = extra_params[extra] if extra_params[extra]
+ end
if extra_params[:order]
params[:order] = extra_params[:order]
params.delete(:select)
diff --git a/spec/models/info_request_spec.rb b/spec/models/info_request_spec.rb
index 76be32e0c..204c600d9 100644
--- a/spec/models/info_request_spec.rb
+++ b/spec/models/info_request_spec.rb
@@ -341,6 +341,14 @@ describe InfoRequest do
InfoRequest.find_old_unclassified(:limit => 5)
end
+ it 'should ask for requests using any offset param supplied' do
+ InfoRequest.should_receive(:find).with(:all, {:select => anything,
+ :order => anything,
+ :conditions=> anything,
+ :offset => 100})
+ InfoRequest.find_old_unclassified(:offset => 100)
+ end
+
it 'should not limit the number of requests returned by default' do
InfoRequest.should_not_receive(:find).with(:all, {:select => anything,
:order => anything,