From: Teryk Bellahsene <teryk.bellahsene@sonarsource.com>
Date: Fri, 2 Oct 2015 08:23:36 +0000 (+0200)
Subject: SONAR-6485 WS permissions/search_project_permissions add qualifier in response
X-Git-Tag: 5.2-RC1~121
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6f9c9fed1844ef459493e099fdf3277ff362e1dc;p=sonarqube.git

SONAR-6485 WS permissions/search_project_permissions add qualifier in response
---

diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/SearchProjectPermissionsAction.java b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/SearchProjectPermissionsAction.java
index 8bbec5caa6c..bf72a44f0b5 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/SearchProjectPermissionsAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/SearchProjectPermissionsAction.java
@@ -111,6 +111,7 @@ public class SearchProjectPermissionsAction implements PermissionsWsAction {
         .clear()
         .setId(rootComponent.uuid())
         .setKey(rootComponent.key())
+        .setQualifier(rootComponent.qualifier())
         .setName(rootComponent.name());
       for (String permission : data.permissions(rootComponent.getId())) {
         rootComponentBuilder.addPermissions(
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/search_project_permissions-example.json b/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/search_project_permissions-example.json
index 724353519c3..43480d67f96 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/search_project_permissions-example.json
+++ b/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/search_project_permissions-example.json
@@ -9,6 +9,7 @@
       "id": "0bd7b1e7-91d6-439e-a607-4a3a9aad3c6a",
       "key": "net.java.openjdk:jdk7",
       "name": "JDK 7",
+      "qualifier": "TRK",
       "permissions": [
         {
           "key": "admin",
@@ -26,6 +27,7 @@
       "id": "ce4c03d6-430f-40a9-b777-ad877c00aa4d",
       "key": "clang",
       "name": "Clang",
+      "qualifier": "TRK",
       "permissions": [
         {
           "key": "issueadmin",
@@ -38,6 +40,7 @@
       "id": "4e607bf9-7ed0-484a-946d-d58ba7dab2fb",
       "key": "simon-brandhof",
       "name": "Simon Brandhof",
+      "qualifier": "DEV",
       "permissions": [
         {
           "key": "admin",
@@ -55,6 +58,7 @@
       "id": "752d8bfd-420c-4a83-a4e5-8ab19b13c8fc",
       "key": "Java",
       "name": "Java",
+      "qualifier": "VW",
       "permissions": [
         {
           "key": "admin",