Replace permission id by permission name in permissions form

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/roles/_edit_groups.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/roles/_edit_groups.html.erb
index 64dc2d6d3541face4c1378bbebafcb3c16ef6da7..41a917e0f854d7eed0312979f3337b211485d9b5 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/roles/_edit_groups.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/roles/_edit_groups.html.erb
@@ -9,7 +9,7 @@
     <input name="role" value="<%= @role -%>" type="hidden"/>
     <fieldset>
       <div class="modal-head">
-        <h2><%= @project ? 'Edit permissions for: ' + h(@project.name) : "System #{role_name(@role)}" -%></h2>
+        <h2><%= @project ? 'Edit permissions for: ' + h(@project.name) : "System #{message("global_permissions.#{@role}")}" -%></h2>
       </div>
       <div class="modal-body">
         <div id="permission-groups-error" class="permission-groups error" style="display:none;" />

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/roles/_edit_users.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/roles/_edit_users.html.erb
index 4e1f7a95060ba419ba6345f684b0b7539d6696b8..e38ea8aca09d95912306b68772d260e24a4e1d7a 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/roles/_edit_users.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/roles/_edit_users.html.erb
@@ -8,7 +8,7 @@
   <input name="role" value="<%= @role -%>" type="hidden" />
   <fieldset>
     <div class="modal-head">
-      <h2><%= @project ? 'Edit permissions for: ' + h(@project.name) : "System #{role_name(@role)}" -%></h2>
+      <h2><%= @project ? 'Edit permissions for: ' + h(@project.name) : "System #{message("global_permissions.#{@role}")}" -%></h2>
     </div>
     <div class="modal-body">
       <div id="permission-users-error" class="permission-users error" style="display:none;" />

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/roles/global.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/roles/global.html.erb
index b9d130f0530687d6539ec5b13dea18a37f3e16d6..e21143652bad42c604fbaa41039ca8379de900a1 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/roles/global.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/roles/global.html.erb
@@ -12,8 +12,8 @@
     <% Java::OrgSonarCorePermission::Permission::allGlobal.keySet.each do |global_permission_key| %>
     <tr class="<%= cycle('even', 'odd', :name => 'global_permission') -%>" >
       <td valign="top">
-        <b><%= message('global_permissions.' + global_permission_key) -%></b><br/>
-        <span class="small gray"><%= message('global_permissions.' + global_permission_key + '.desc') -%></span></td>
+        <b><%= message("global_permissions.#{global_permission_key}") -%></b><br/>
+        <span class="small gray"><%= message("global_permissions.#{global_permission_key}.desc") -%></span></td>
       <td valign="top" style="word-break:break-all;width:30%;">
         <span><%= users(global_permission_key).map(&:name).join(', ') -%></span>
         (<%= link_to_edit_roles_permission_form(message('select'), global_permission_key, nil, "select-users-#{global_permission_key}") %>)<br/>