mirror of
https://github.com/redmine/redmine.git
synced 2025-11-13 00:36:01 +01:00
Fixes that group icons in Watchers box have both the old and the new icon style (#41853).
git-svn-id: https://svn.redmine.org/redmine/trunk@23328 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
@@ -651,17 +651,12 @@ module ApplicationHelper
|
||||
def principals_check_box_tags(name, principals)
|
||||
s = +''
|
||||
principals.each do |principal|
|
||||
s <<
|
||||
content_tag(
|
||||
'label',
|
||||
check_box_tag(name, principal.id, false, :id => nil) +
|
||||
(avatar(principal, :size => 16).presence ||
|
||||
content_tag(
|
||||
'span', principal_icon(principal),
|
||||
:class => "name icon icon-#{principal.class.name.downcase}"
|
||||
)
|
||||
) + principal.to_s
|
||||
)
|
||||
principal_check_box = +''
|
||||
principal_check_box << check_box_tag(name, principal.id, false, :id => nil)
|
||||
principal_check_box << avatar(principal, :size => 16).to_s if principal.is_a?(User)
|
||||
principal_check_box << content_tag('span', principal_icon(principal), :class => "name icon icon-#{principal.class.to_s.downcase}")
|
||||
principal_check_box << principal.to_s
|
||||
s << content_tag('label', principal_check_box.html_safe)
|
||||
end
|
||||
s.html_safe
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user