From ef54b378e1523bdd38342e3e841df0870a3ab60f Mon Sep 17 00:00:00 2001
From: Julien HENRY <julien.henry@sonarsource.com>
Date: Thu, 28 Nov 2013 11:26:06 +0100
Subject: [PATCH] SONAR-2447 New project permission: Administer Issues

---
 .../src/main/resources/org/sonar/l10n/core.properties       | 2 ++
 .../WEB-INF/app/views/permission_templates/index.html.erb   | 6 +++++-
 .../main/webapp/WEB-INF/app/views/roles/projects.html.erb   | 6 +++++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties b/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
index 656c164955f..edb6a0390c8 100644
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
@@ -2355,6 +2355,8 @@ projects_role.role=Role Membership For New
 projects_role.groups=Groups
 projects_role.admin=Administer
 projects_role.admin.desc=Ability to access project settings and perform administration tasks. (Users will also need "Browse" permission)
+projects_role.issueadmin=Administer Issues
+projects_role.issueadmin.desc=Grants the permission to perform advanced editing on issues, such as marking an issue False Positive or changing an Issue's severity.
 projects_role.user=Browse
 projects_role.user.desc=Ability to access a project, browse its measures, and create/edit issues for it.
 projects_role.codeviewer=See Source Code
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/permission_templates/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/permission_templates/index.html.erb
index 6502fb9203c..c57272cfeb4 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/permission_templates/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/permission_templates/index.html.erb
@@ -25,6 +25,10 @@
       <%= message('projects_role.admin') -%><br/>
       <span class="small gray" style="font-size: 11px; font-weight: normal;"><%= message('projects_role.admin.desc') -%></span>
     </th>
+    <th class="left">
+      <%= message('projects_role.issueadmin') -%><br/>
+      <span class="small gray" style="font-size: 11px; font-weight: normal;"><%= message('projects_role.issueadmin.desc') -%></span>
+    </th>
     <th class="left">
       <%= message('projects_role.codeviewer') -%><br/>
       <span class="small gray" style="font-size: 11px; font-weight: normal;"><%= message('projects_role.codeviewer.desc') -%></span>
@@ -45,7 +49,7 @@
       <td valign="top"><b><%= h permission_template.name %></b><br/>
         <span class="small gray"><%= h permission_template.description -%></span>
       </td>
-      <% ['user', 'admin', 'codeviewer'].each do |permission| -%>
+      <% ['user', 'admin', 'issueadmin', 'codeviewer'].each do |permission| -%>
         <td valign="top">
           <%
              users=Api::Utils.insensitive_sort(permission_template.getUsersForPermission(permission).collect {|u| u.userName})
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/roles/projects.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/roles/projects.html.erb
index 8d01e85034d..1a9a6ea421c 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/roles/projects.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/roles/projects.html.erb
@@ -53,6 +53,10 @@
         <%= message('projects_role.admin') -%><br/>
         <span class="small gray" style="font-size: 11px; font-weight: normal;"><%= message('projects_role.admin.desc') -%></span>
       </th>
+      <th>
+        <%= message('projects_role.issueadmin') -%><br/>
+        <span class="small gray" style="font-size: 11px; font-weight: normal;"><%= message('projects_role.issueadmin.desc') -%></span>
+      </th>
       <th>
         <%= message('projects_role.codeviewer') -%><br/>
         <span class="small gray" style="font-size: 11px; font-weight: normal;"><%= message('projects_role.codeviewer.desc') -%></span>
@@ -79,7 +83,7 @@
       <td valign="top"><b><%= h project.name %></b><br/>
         <span class="small gray"><%= h project.key -%></span>
       </td>
-      <% ['user', 'admin', 'codeviewer'].each do |permission| -%>
+      <% ['user', 'admin', 'issueadmin', 'codeviewer'].each do |permission| -%>
         <td valign="top">
           <%
              users=Api::Utils.insensitive_sort(project.user_roles.select { |ur| ur.role==permission }.map { |ur| ur.user.name })
-- 
2.39.5