diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-03-20 09:58:32 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-03-20 09:58:32 +0000 |
| commit | c0c05ec41edfc8d7587eb7e5a030c86127b3cda7 (patch) | |
| tree | 21189d4d59dbfe46bad9f1768e4b75dd871a2b53 /app | |
| parent | 84c8ca6fefa3266527b754944ccb15e9393b1ae7 (diff) | |
| download | redmine-c0c05ec41edfc8d7587eb7e5a030c86127b3cda7.tar.gz redmine-c0c05ec41edfc8d7587eb7e5a030c86127b3cda7.zip | |
Don't let users be sorted by email (#19161).
git-svn-id: http://svn.redmine.org/redmine/trunk@14140 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/users_controller.rb | 2 | ||||
| -rw-r--r-- | app/views/users/index.html.erb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 5958e36f8..f52c44a97 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -30,7 +30,7 @@ class UsersController < ApplicationController def index sort_init 'login', 'asc' - sort_update %w(login firstname lastname mail admin created_on last_login_on) + sort_update %w(login firstname lastname admin created_on last_login_on) case params[:format] when 'xml', 'json' diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index a89712dad..7cd6bb067 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -28,7 +28,7 @@ <%= 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)) %> + <th><%= l(:field_mail) %></th> <%= 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') %> |