SONAR-6796 use the latest response format

diff --git a/server/sonar-web/src/main/js/apps/global-permissions/main.jsx b/server/sonar-web/src/main/js/apps/global-permissions/main.jsx
index fd2095883890245019e418345fd971a5a66a273e..8712c979465d8719090432a0be4aa11ee842ed44 100644 (file)
--- a/server/sonar-web/src/main/js/apps/global-permissions/main.jsx
+++ b/server/sonar-web/src/main/js/apps/global-permissions/main.jsx
@@ -15,7 +15,7 @@ export default React.createClass({
   requestPermissions() {
     const url = `${window.baseUrl}/api/permissions/search_global_permissions`;
     $.get(url).done(r => {
-      this.setState({ permissions: r.globalPermissions });
+      this.setState({ permissions: r.permissions });
     });
   },
 

diff --git a/server/sonar-web/src/main/js/apps/global-permissions/permission-groups.jsx b/server/sonar-web/src/main/js/apps/global-permissions/permission-groups.jsx
index a79c9c16afff53f4f3750dee9538461311b38758..e710f3713b0d22e811cf26a71e17ccea5c3f9c10 100644 (file)
--- a/server/sonar-web/src/main/js/apps/global-permissions/permission-groups.jsx
+++ b/server/sonar-web/src/main/js/apps/global-permissions/permission-groups.jsx
@@ -20,7 +20,6 @@ export default React.createClass({
   },
 
   renderTitle() {
-    console.log(this.props);
     return 'Groups';
   },
 

diff --git a/server/sonar-web/src/test/json/permissions/global-permissions.json b/server/sonar-web/src/test/json/permissions/global-permissions.json
index 2d1ee99e0979709998f77746b1b2a44d9af643c1..3ee0d8bed1477ffa17c8241cd3026f44b0c453a6 100644 (file)
--- a/server/sonar-web/src/test/json/permissions/global-permissions.json
+++ b/server/sonar-web/src/test/json/permissions/global-permissions.json
@@ -1,5 +1,5 @@
 {
-  "globalPermissions": [
+  "permissions": [
     {
       "key": "admin",
       "name": "Administer System",