Index: app/views/projects/settings/_members.html.erb =================================================================== --- app/views/projects/settings/_members.html.erb (revision 16111) +++ app/views/projects/settings/_members.html.erb (working copy) @@ -14,10 +14,33 @@ +<% + group_member_role_by_id = {} + members.each do |member| + next if member.new_record? + + member.member_roles.each{|mr| + next if mr.inherited_from.present? + next if mr.member.principal.is_a?(::User) + next if group_member_role_by_id[mr.id].present? + group_member_role_by_id[mr.id] = mr + } + end +-%> <% members.each do |member| %> - <% next if member.new_record? %> + <% next if member.new_record? + label_group = '' + member.member_roles.each{|mr| + if mr.inherited_from.present? + next if group_member_role_by_id[mr.inherited_from].nil? + label_group = " (#{group_member_role_by_id[mr.inherited_from].member.principal.lastname})" + + break + end + } + %> - <%= link_to_user member.principal %> + <%= link_to_user member.principal %><%= label_group %> <%= member.roles.sort.collect(&:to_s).join(', ') %> <%= form_for(member,