Fix NoMethodError when generating a link to a locked user (#12795, #35823).

git-svn-id: http://svn.redmine.org/redmine/trunk@21217 e93f8b46-1217-0410-a6f0-8f06a7374b81

2 files changed, 8 insertions, 3 deletions

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index e3c858db4..03fb26d4c 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -60,19 +60,20 @@ module ApplicationHelper
     case principal
     when User
       name = h(principal.name(options[:format]))
+      css_classes = ''
       if principal.active? || (User.current.admin? && principal.logged?)
         url = user_url(principal, :only_path => only_path)
-        css_classes = principal.css_classes
+        css_classes += principal.css_classes
       end
     when Group
       name = h(principal.to_s)
       url = group_url(principal, :only_path => only_path)
-      css_classes = 'group'
+      css_classes = principal.css_classes
     else
       name = h(principal.to_s)
     end
 
-    css_classes += " #{options[:class]}" if options[:class].present?
+    css_classes += " #{options[:class]}" if css_classes && options[:class].present?
     url ? link_to(name, url, :class => css_classes) : name
   end
 
diff --git a/app/models/group.rb b/app/models/group.rb
index a1fd35602..a676816ec 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -73,6 +73,10 @@ class Group < Principal
     !builtin?
   end
 
+  def css_classes
+    'group'
+  end
+
   def user_added(user)
     members.each do |member|
       next if member.project.nil?