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

diff --git a/app/helpers/watchers_helper.rb b/app/helpers/watchers_helper.rb
index fc97da1056797337bff4a8df0c7df850ec6268a7..97067378e47d4617d9fa3d33d54cc85006cb1cc6 100644 (file)
--- 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 8c9ef35c1d1b858bab3b4a77dee9a30bc026a0fe..f7fdea5c1a3667dfb39171b908b792207977d875 100644 (file)
--- 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