summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarius Balteanu <marius.balteanu@zitec.com>2022-11-28 22:59:05 +0000
committerMarius Balteanu <marius.balteanu@zitec.com>2022-11-28 22:59:05 +0000
commitc0f60e5febf1445ecf1f0b530bd418aaba8eb7c1 (patch)
treec19e3616a874b15d046892121e8166750ffd7656
parent258d2fe87f91502367d47c6ca1e32ced01dd2c54 (diff)
downloadredmine-c0f60e5febf1445ecf1f0b530bd418aaba8eb7c1.tar.gz
redmine-c0f60e5febf1445ecf1f0b530bd418aaba8eb7c1.zip
Fix groups added to watchers are not shown as links (#37958).
Patch by Mizuki ISHIKAWA. git-svn-id: https://svn.redmine.org/redmine/trunk@21967 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/helpers/watchers_helper.rb2
-rw-r--r--test/functional/issues_controller_test.rb2
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 a10abbd12..58e51348a 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -2726,7 +2726,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