diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 5958e36..f52c44a 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 fe3d6de..25a429a 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)) %> + <%= 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') %>