diff options
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/application_helper.rb | 17 | ||||
| -rw-r--r-- | app/helpers/watchers_helper.rb | 2 |
2 files changed, 12 insertions, 7 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 4aa233851..bac8da266 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -651,12 +651,17 @@ module ApplicationHelper def principals_check_box_tags(name, principals) s = +'' principals.each do |principal| - 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) + 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 + ) end s.html_safe end diff --git a/app/helpers/watchers_helper.rb b/app/helpers/watchers_helper.rb index 00afd30ae..f7763e41b 100644 --- a/app/helpers/watchers_helper.rb +++ b/app/helpers/watchers_helper.rb @@ -49,7 +49,7 @@ module WatchersHelper content = ''.html_safe lis = object.watcher_users.sorted.collect do |user| s = ''.html_safe - s << avatar(user, :size => "16").to_s if user.is_a?(User) + s << avatar(user, :size => "16").to_s 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)) |