From c8227930f9321251879e2ec0cde36c53b7777f46 Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Thu, 3 Dec 2020 15:14:35 +0000 Subject: TypeError when attempting to update a user with a blank email address (#33355). Patch by Go MAEDA. git-svn-id: http://svn.redmine.org/redmine/trunk@20562 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/views/users/edit.html.erb | 2 +- test/functional/users_controller_test.rb | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb index 2a8b6707f..786630869 100644 --- a/app/views/users/edit.html.erb +++ b/app/views/users/edit.html.erb @@ -7,7 +7,7 @@ <%= page_title = title [l(:label_user_plural), users_path], @user.login - page_title.insert(page_title.rindex(' ') + 1, avatar(@user)) + page_title.insert(page_title.rindex(' ') + 1, avatar(@user).to_s) %> <%= render_tabs user_settings_tabs %> diff --git a/test/functional/users_controller_test.rb b/test/functional/users_controller_test.rb index dfc6be848..459762c50 100644 --- a/test/functional/users_controller_test.rb +++ b/test/functional/users_controller_test.rb @@ -819,6 +819,19 @@ class UsersControllerTest < Redmine::ControllerTest assert_response 404 end + def test_update_with_blank_email_should_not_raise_exception + assert_no_difference 'User.count' do + with_settings :gravatar_enabled => '1' do + put :update, :params => { + :id => 2, + :user => {:mail => ''} + } + end + end + assert_response :success + assert_select_error /Email cannot be blank/ + end + def test_destroy assert_difference 'User.count', -1 do delete :destroy, :params => {:id => 2} -- cgit v1.2.3