diff options
| author | Matthew Landauer <matthew@openaustralia.org> | 2013-01-30 08:50:31 +1100 |
|---|---|---|
| committer | Matthew Landauer <matthew@openaustralia.org> | 2013-01-30 08:50:31 +1100 |
| commit | 0d9f3f8fe6ab7d102e9291a79a294fced603317a (patch) | |
| tree | 0e6f9a4d06724d868cea4febaca4584c9ca20e7a /app/controllers/admin_user_controller.rb | |
| parent | 581475dddb48e000dc5143937677dd8b412569b5 (diff) | |
Convert query to more activerecord 3 form
Diffstat (limited to 'app/controllers/admin_user_controller.rb')
| -rw-r--r-- | app/controllers/admin_user_controller.rb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/app/controllers/admin_user_controller.rb b/app/controllers/admin_user_controller.rb index ed20ddcf4..3beefb9af 100644 --- a/app/controllers/admin_user_controller.rb +++ b/app/controllers/admin_user_controller.rb @@ -12,9 +12,13 @@ class AdminUserController < AdminController def list @query = params[:query] - @admin_users = User.paginate :order => "name", :page => params[:page], :per_page => 100, - :conditions => @query.nil? ? nil : ["lower(name) like lower('%'||?||'%') or - lower(email) like lower('%'||?||'%')", @query, @query] + if @query + users = User.where(["lower(name) like lower('%'||?||'%') or + lower(email) like lower('%'||?||'%')", @query, @query]) + else + users = User.all + end + @admin_users = users.paginate :order => "name", :page => params[:page], :per_page => 100 end def list_banned |