diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-03-21 08:30:55 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-03-21 08:30:55 +0000 |
| commit | 5eb1b2626de83ab0b622f60e9387dfd920654726 (patch) | |
| tree | 37bb018f9304fa16936f4c65aaa80bbc6904845c | |
| parent | c6c304edf1e399b0669424bf011ea40a4217556e (diff) | |
| download | redmine-5eb1b2626de83ab0b622f60e9387dfd920654726.tar.gz redmine-5eb1b2626de83ab0b622f60e9387dfd920654726.zip | |
Merged r14140 (#19161).
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14149 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -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 fe3d6de44..25a429a53 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') %> |