aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Landauer <matthew@openaustralia.org>2013-01-30 08:54:10 +1100
committerMatthew Landauer <matthew@openaustralia.org>2013-01-30 08:54:10 +1100
commitde974101f27325d77348abdbb33ce1084614ab0a (patch)
tree37cebdf01932e837ad24e6ca5d723625ffe9a736
parent0d9f3f8fe6ab7d102e9291a79a294fced603317a (diff)
Convert query to more activerecord 3 form
-rw-r--r--app/controllers/admin_track_controller.rb8
1 files changed, 6 insertions, 2 deletions
diff --git a/app/controllers/admin_track_controller.rb b/app/controllers/admin_track_controller.rb
index 03217da45..3b75c4f7b 100644
--- a/app/controllers/admin_track_controller.rb
+++ b/app/controllers/admin_track_controller.rb
@@ -7,8 +7,12 @@
class AdminTrackController < AdminController
def list
@query = params[:query]
- @admin_tracks = TrackThing.paginate :order => "created_at desc", :page => params[:page], :per_page => 100,
- :conditions => @query.nil? ? nil : ["lower(track_query) like lower('%'||?||'%')", @query ]
+ if @query
+ track_things = TrackThing.where(["lower(track_query) like lower('%'||?||'%')", @query])
+ else
+ track_things = TrackThing.all
+ end
+ @admin_tracks = track_things.paginate :order => "created_at desc", :page => params[:page], :per_page => 100
end
private