aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Landauer <matthew@openaustralia.org>2013-01-30 08:56:41 +1100
committerMatthew Landauer <matthew@openaustralia.org>2013-01-30 08:56:41 +1100
commit08c182e09c9eee4b06fb1507f606a54dbe8d1c6d (patch)
tree32325b142d9d154acfa850e11acab1c9e52341cc
parentde974101f27325d77348abdbb33ce1084614ab0a (diff)
Convert query to more activerecord 3 form
-rw-r--r--app/controllers/admin_request_controller.rb12
1 files changed, 5 insertions, 7 deletions
diff --git a/app/controllers/admin_request_controller.rb b/app/controllers/admin_request_controller.rb
index 15b8b0ddf..eec684b0a 100644
--- a/app/controllers/admin_request_controller.rb
+++ b/app/controllers/admin_request_controller.rb
@@ -15,15 +15,13 @@ class AdminRequestController < AdminController
def list
@query = params[:query]
if @query
- @info_requests = InfoRequest.paginate :order => "created_at desc",
- :page => params[:page],
- :per_page => 100,
- :conditions => ["lower(title) like lower('%'||?||'%')", @query]
+ info_requests = InfoRequest.where(["lower(title) like lower('%'||?||'%')", @query])
else
- @info_requests = InfoRequest.all.paginate :order => "created_at desc",
- :page => params[:page],
- :per_page => 100
+ info_requests = InfoRequest.all
end
+ @info_requests = info_requests.paginate :order => "created_at desc",
+ :page => params[:page],
+ :per_page => 100
end
def list_old_unclassified