diff options
| author | Go MAEDA <maeda@farend.jp> | 2019-05-20 08:51:04 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2019-05-20 08:51:04 +0000 |
| commit | da78e654f13b9b13e1584bac91dae9631c12f63e (patch) | |
| tree | e876514c819c08da93fb3e0799a52cc1feaa3e45 | |
| parent | c341b62fed7f165a5945f66d48bebf92767fde67 (diff) | |
| download | redmine-da78e654f13b9b13e1584bac91dae9631c12f63e.tar.gz redmine-da78e654f13b9b13e1584bac91dae9631c12f63e.zip | |
Display user's gravatar when editing profile (#5899).
Patch by Go MAEDA.
git-svn-id: http://svn.redmine.org/redmine/trunk@18180 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/views/users/edit.html.erb | 5 | ||||
| -rw-r--r-- | test/functional/users_controller_test.rb | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb index 67b57f802..2a8b6707f 100644 --- a/app/views/users/edit.html.erb +++ b/app/views/users/edit.html.erb @@ -5,6 +5,9 @@ <%= delete_link user_path(@user) if User.current != @user %> </div> -<%= title [l(:label_user_plural), users_path], @user.login %> +<%= + page_title = title [l(:label_user_plural), users_path], @user.login + page_title.insert(page_title.rindex(' ') + 1, avatar(@user)) +%> <%= render_tabs user_settings_tabs %> diff --git a/test/functional/users_controller_test.rb b/test/functional/users_controller_test.rb index d1fdd2150..2798c023d 100644 --- a/test/functional/users_controller_test.rb +++ b/test/functional/users_controller_test.rb @@ -420,8 +420,11 @@ class UsersControllerTest < Redmine::ControllerTest def test_edit - get :edit, :params => {:id => 2} + with_settings :gravatar_enabled => '1' do + get :edit, :params => {:id => 2} + end assert_response :success + assert_select 'h2>a+img.gravatar' assert_select 'input[name=?][value=?]', 'user[login]', 'jsmith' end |