meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-01-31 11:37:14 +00:00
Code Issues Releases Wiki Activity

Set "icon icon-group" CSS classes in _members_box.html.erb instead of ApplicationHeler (#12795).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@21074 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA 2021-07-20 21:35:06 +00:00
parent 56a7fd22c7
commit 605dadd374
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/helpers/application_helper.rb
View File

@ -67,11 +67,12 @@ module ApplicationHelper
when Group
name = h(principal.to_s)
url = group_url(principal, :only_path => only_path)
css_classes = "group icon icon-#{principal.class.name.downcase}"
css_classes = 'group'
else
name = h(principal.to_s)
end
css_classes += " #{options[:class]}" if options[:class].present?
url ? link_to(name, url, :class => css_classes) : name
end

2
app/views/projects/_members_box.html.erb
View File

@ -2,7 +2,7 @@
<div class="members box">
<h3 class="icon icon-group"><%=l(:label_member_plural)%></h3>
<% @principals_by_role.keys.sort.each do |role| %>
<p><span class="label"><%= role %>:</span> <%= @principals_by_role[role].sort.collect{|p| link_to_principal p}.join(", ").html_safe %></p>
<p><span class="label"><%= role %>:</span> <%= @principals_by_role[role].sort.collect{|p| link_to_principal(p, :class => p.is_a?(Group) ? 'icon icon-group' : nil)}.join(", ").html_safe %></p>
<% end %>
</div>
<% end %>

2
test/helpers/application_helper_test.rb
View File

@ -1715,7 +1715,7 @@ class ApplicationHelperTest < Redmine::HelperTest
def test_link_to_principal_should_link_to_group
group = Group.find(10)
result = link_to('A Team', '/groups/10', :class => 'group icon icon-group')
result = link_to('A Team', '/groups/10', :class => 'group')
assert_equal result, link_to_principal(group)
end