diff options
| -rw-r--r-- | app/controllers/admin_user_controller.rb | 7 | ||||
| -rw-r--r-- | app/views/admin_user/list.rhtml | 22 | ||||
| -rw-r--r-- | app/views/admin_user/list_banned.rhtml | 9 |
3 files changed, 17 insertions, 21 deletions
diff --git a/app/controllers/admin_user_controller.rb b/app/controllers/admin_user_controller.rb index ca4dd9045..4760e5ad1 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.10 2009-03-09 01:17:04 francis Exp $ +# $Id: admin_user_controller.rb,v 1.11 2009-06-25 16:51:38 francis Exp $ class AdminUserController < AdminController def index @@ -19,6 +19,11 @@ class AdminUserController < AdminController lower(email) like lower('%'||?||'%')", @query, @query] end + def list_banned + @banned_users = User.paginate :order => "name", :page => params[:page], :per_page => 100, + :conditions => ["ban_text <> ''"] + end + def show # Don't use @user as that is any logged in user @admin_user = User.find(params[:id]) diff --git a/app/views/admin_user/list.rhtml b/app/views/admin_user/list.rhtml index bbd9e82e3..677de1499 100644 --- a/app/views/admin_user/list.rhtml +++ b/app/views/admin_user/list.rhtml @@ -6,28 +6,10 @@ <p> <%= text_field_tag 'query', params[:query], { :size => 30 } %> <%= submit_tag "Search" %> (substring search, names and emails) + <%= link_to 'Banned users', 'list_banned' %></p> </p> <% end %> -<table> - <tr> - <th>Id</th> - <% for column in ['Name', 'Email', 'Created at', 'Updated at', 'Email confirmed', 'Admin'] %> - <th><%= column %></th> - <% end %> - </tr> - -<% for user in @admin_users %> - <tr class="<%= cycle('odd', 'even') %>"> - <td><%= user.id.to_s %></td> - <td><%= user_both_links(user) %></td> - <td><a href="mailto:<%=h user.email %>"><%=h user.email%></a></td> - <% for column in ['created_at', 'updated_at', 'email_confirmed', 'admin_level'] %> - <td><%=h user.send(column) %></td> - <% end %> - </tr> -<% end %> -</table> +<%= render :partial => 'user_table', :locals => { :users => @admin_users, :banned_column => false } %> -<%= will_paginate(@admin_users) %> diff --git a/app/views/admin_user/list_banned.rhtml b/app/views/admin_user/list_banned.rhtml new file mode 100644 index 000000000..be2d45399 --- /dev/null +++ b/app/views/admin_user/list_banned.rhtml @@ -0,0 +1,9 @@ +<% @title = 'Banned users' %> + +<h1><%=@title%></h1> + +<p><%= link_to 'List all', 'list' %></p> + +<%= render :partial => 'user_table', :locals => { :users => @banned_users, :banned_column => true } %> + + |