aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/controllers/admin_user_controller.rb7
-rw-r--r--app/views/admin_user/list.rhtml7
2 files changed, 12 insertions, 2 deletions
diff --git a/app/controllers/admin_user_controller.rb b/app/controllers/admin_user_controller.rb
index f62250ce1..e66839bc2 100644
--- a/app/controllers/admin_user_controller.rb
+++ b/app/controllers/admin_user_controller.rb
@@ -4,7 +4,7 @@
# Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: admin_user_controller.rb,v 1.1 2008-01-22 18:34:15 francis Exp $
+# $Id: admin_user_controller.rb,v 1.2 2008-03-14 10:15:43 francis Exp $
class AdminUserController < ApplicationController
layout "admin"
@@ -15,7 +15,10 @@ class AdminUserController < ApplicationController
end
def list
- @admin_users = User.paginate :order => "name", :page => params[:page], :per_page => 100
+ @query = params[:query]
+ @admin_users = User.paginate :order => "name", :page => params[:page], :per_page => 100,
+ :conditions => @query.nil? ? nil : ["name ilike '%'||?||'%' or
+ email ilike '%'||?||'%'", @query, @query]
end
def show
diff --git a/app/views/admin_user/list.rhtml b/app/views/admin_user/list.rhtml
index 969caa765..85e4b08f2 100644
--- a/app/views/admin_user/list.rhtml
+++ b/app/views/admin_user/list.rhtml
@@ -2,6 +2,13 @@
<h1><%=@title%></h1>
+<p>
+ <% form_tag({}) do %>
+ <%= text_field_tag 'query', params[:query], { :size => 30 } %>
+ <%= submit_tag "Search" %> (substring search, names and emails)
+ <% end %>
+</p>
+
<table>
<tr>
<th>Id</th>