diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index 2a72a5db4..74b85b44c 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -78,8 +78,10 @@ module UsersHelper 'lastname', 'mail', 'admin', + 'updated_on', 'created_on', 'last_login_on', + 'passwd_changed_on', 'status' ] user_custom_fields = UserCustomField.all diff --git a/config/locales/en.yml b/config/locales/en.yml index cd9b9a766..f22bdbd50 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -307,6 +307,7 @@ en: field_mail_notification: Email notifications field_admin: Administrator field_last_login_on: Last connection + field_passwd_changed_on: Last password change on field_language: Language field_effective_date: Due date field_password: Password diff --git a/test/functional/users_controller_test.rb b/test/functional/users_controller_test.rb index 7be370de2..35a1e82d7 100644 --- a/test/functional/users_controller_test.rb +++ b/test/functional/users_controller_test.rb @@ -68,12 +68,16 @@ class UsersControllerTest < Redmine::ControllerTest def test_index_csv with_settings :default_language => 'en' do + user = User.logged.status(1).first + user.update(passwd_changed_on: Time.current.last_month) get :index, :params => { :format => 'csv' } assert_response :success assert_equal User.logged.status(1).count, response.body.chomp.split("\n").size - 1 assert_include 'active', response.body assert_not_include 'locked', response.body + assert_include format_time(user.updated_on), response.body + assert_include format_time(user.passwd_changed_on), response.body assert_equal 'text/csv', @response.media_type end end