From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 2 Feb 2012 22:31:00 +0000 (+0000)
Subject: Permissions report: display role names on each permission group (#10119).
X-Git-Tag: 1.4.0~541
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=46ab7b45d7e7f6fb5d15773bb40615786e6de332;p=redmine.git

Permissions report: display role names on each permission group (#10119).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8755 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/views/roles/permissions.html.erb b/app/views/roles/permissions.html.erb
index 32703e791..da8e1ad8b 100644
--- a/app/views/roles/permissions.html.erb
+++ b/app/views/roles/permissions.html.erb
@@ -3,7 +3,7 @@
 <% form_tag(permissions_roles_path, :id => 'permissions_form') do %>
 <%= hidden_field_tag 'permissions[0]', '', :id => nil %>
 <div class="autoscroll">
-<table class="list">
+<table class="list permissions">
 <thead>
     <tr>
     <th><%=l(:label_permissions)%></th>
@@ -21,10 +21,13 @@
 <% perms_by_module.keys.sort.each do |mod| %>
     <% unless mod.blank? %>
         <tr class="group open">
-          <td colspan="<%= @roles.size + 1 %>">
+          <td>
             <span class="expander" onclick="toggleRowGroup(this);">&nbsp;</span>
             <%= l_or_humanize(mod, :prefix => 'project_module_') %>
           </td>
+          <% @roles.each do |role| %>
+          <td class="role"><%= h(role.name) %></td>
+          <% end %>
         </tr>
     <% end %>
     <% perms_by_module[mod].each do |permission| %>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 5204df4cf..ea4fc0410 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -202,6 +202,8 @@ tr.user td { white-space: nowrap; }
 tr.user.locked, tr.user.registered { color: #aaa; }
 tr.user.locked a, tr.user.registered a { color: #aaa; }
 
+table.permissions td.role {color:#999;font-size:90%;font-weight:normal !important;text-align:center;vertical-align:bottom;}
+
 tr.wiki-page-version td.updated_on, tr.wiki-page-version td.author {text-align:center;}
 
 tr.time-entry { text-align: center; white-space: nowrap; }