From 8d7a6d548520ae3a7ebd779c69322ddb229134c9 Mon Sep 17 00:00:00 2001 From: Marius Balteanu Date: Tue, 29 Nov 2022 07:17:47 +0000 Subject: [PATCH] Merge r21967 from trunk to 5.0-stable (#37958). git-svn-id: https://svn.redmine.org/redmine/branches/5.0-stable@21970 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/helpers/watchers_helper.rb | 2 +- test/functional/issues_controller_test.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/helpers/watchers_helper.rb b/app/helpers/watchers_helper.rb index fc97da105..97067378e 100644 --- a/app/helpers/watchers_helper.rb +++ b/app/helpers/watchers_helper.rb @@ -51,7 +51,7 @@ module WatchersHelper lis = object.watcher_users.collect do |user| s = ''.html_safe s << avatar(user, :size => "16").to_s - s << link_to_user(user, :class => 'user') + s << link_to_principal(user, class: user.class.to_s.downcase) if object.respond_to?(:visible?) && user.is_a?(User) && !object.visible?(user) s << content_tag('span', l(:notice_invalid_watcher), class: 'icon-only icon-warning', title: l(:notice_invalid_watcher)) end diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb index 8c9ef35c1..f7fdea5c1 100644 --- a/test/functional/issues_controller_test.rb +++ b/test/functional/issues_controller_test.rb @@ -2700,7 +2700,7 @@ class IssuesControllerTest < Redmine::ControllerTest end assert_select "li.user-10" do assert_select 'img.gravatar[title=?]', 'A Team' - assert_select 'a[href="/users/10"]', false + assert_select 'a[href="/groups/10"]' assert_select 'a[class*=delete]' end end -- 2.39.5