jro_apps/redmine Commit - r1734:41d44c5285a7

Adds user count in status drop down on admin user list....

Jean-Philippe Lang -

r1734:41d44c5285a7

parent child

Context file:

r1734:41d44c5285a7

Collapse all files

app/helpers/users_helper.rb +5 -4

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             module UsersHelper
-              def status_options_for_select(selected)
+              def users_status_options_for_select(selected)
+                user_count_by_status = User.count(:group => 'status').to_hash
                 options_for_select([[l(:label_all), ''],
-                                    [l(:status_active), 1],
+                                    ["#{l(:status_active)} (#{user_count_by_status[1].to_i})", 1],
-                                    [l(:status_registered), 2],
+                                    ["#{l(:status_registered)} (#{user_count_by_status[2].to_i})", 2],
-                                    [l(:status_locked), 3]], selected)
+                                    ["#{l(:status_locked)} (#{user_count_by_status[3].to_i})", 3]], selected)
               end
               # Options for the new membership projects combo-box
               def projects_options_for_select(projects)
                 options = content_tag('option', "--- #{l(:actionview_instancetag_blank_option)} ---")
                 projects_by_root = projects.group_by(&:root)
                 projects_by_root.keys.sort.each do |root|
                   options << content_tag('option', h(root.name), :value => root.id, :disabled => (!projects.include?(root)))
                   projects_by_root[root].sort.each do |project|
                     next if project == root
                     options << content_tag('option', '&#187; ' + h(project.name), :value => project.id)
                   end
                 end
                 options
               end
               def change_status_link(user)
                 url = {:action => 'edit', :id => user, :page => params[:page], :status => params[:status]}
                 if user.locked?
                   link_to l(:button_unlock), url.merge(:user => {:status => User::STATUS_ACTIVE}), :method => :post, :class => 'icon icon-unlock'
                 elsif user.registered?
                   link_to l(:button_activate), url.merge(:user => {:status => User::STATUS_ACTIVE}), :method => :post, :class => 'icon icon-unlock'
                 elsif user != User.current
                   link_to l(:button_lock), url.merge(:user => {:status => User::STATUS_LOCKED}), :method => :post, :class => 'icon icon-lock'
                 end
               end
               def user_settings_tabs
                 tabs = [{:name => 'general', :partial => 'users/general', :label => :label_general},
                         {:name => 'memberships', :partial => 'users/memberships', :label => :label_project_plural}
                         ]
               end
             end

app/views/users/list.rhtml +1 -1

             <div class="contextual">
             <%= link_to l(:label_user_new), {:action => 'add'}, :class => 'icon icon-add' %>
             </div>
             <h2><%=l(:label_user_plural)%></h2>
             <% form_tag({}, :method => :get) do %>
             <fieldset><legend><%= l(:label_filter_plural) %></legend>
             <label><%= l(:field_status) %> :</label>
-            <%= select_tag 'status', status_options_for_select(@status), :class => "small", :onchange => "this.form.submit(); return false;"  %>
+            <%= select_tag 'status', users_status_options_for_select(@status), :class => "small", :onchange => "this.form.submit(); return false;"  %>
             </fieldset>
             <% end %>
             &nbsp;
             <table class="list">
               <thead><tr>
             	<%= sort_header_tag('login', :caption => l(:field_login)) %>
             	<%= sort_header_tag('firstname', :caption => l(:field_firstname)) %>
             	<%= sort_header_tag('lastname', :caption => l(:field_lastname)) %>
             	<%= sort_header_tag('mail', :caption => l(:field_mail)) %>
             	<%= sort_header_tag('admin', :caption => l(:field_admin), :default_order => 'desc') %>
             	<%= sort_header_tag('created_on', :caption => l(:field_created_on), :default_order => 'desc') %>
             	<%= sort_header_tag('last_login_on', :caption => l(:field_last_login_on), :default_order => 'desc') %>
                 <th></th>
               </tr></thead>
               <tbody>
             <% for user in @users -%>
               <tr class="user <%= cycle("odd", "even") %> <%= %w(anon active registered locked)[user.status] %>">
             	<td class="username"><%= link_to h(user.login), :action => 'edit', :id => user %></td>
             	<td class="firstname"><%= h(user.firstname) %></td>
             	<td class="lastname"><%= h(user.lastname) %></td>
             	<td class="email"><%= mail_to(h(user.mail)) %></td>
             	<td align="center"><%= image_tag('true.png') if user.admin? %></td>
             	<td class="created_on" align="center"><%= format_time(user.created_on) %></td>
             	<td class="last_login_on" align="center"><%= format_time(user.last_login_on) unless user.last_login_on.nil? %></td>
                 <td><small><%= change_status_link(user) %></small></td>
               </tr>
             <% end -%>
               </tbody>
             </table>
             <p class="pagination"><%= pagination_links_full @user_pages, @user_count %></p>
             <% html_title(l(:label_user_plural)) -%>

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages