From c3f24463750b059f967572dafba540dcc058d562 Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Wed, 19 Aug 2015 16:35:46 +0200 Subject: [PATCH] SONAR-6796 use the latest response format --- server/sonar-web/src/main/js/apps/global-permissions/main.jsx | 2 +- .../src/main/js/apps/global-permissions/permission-groups.jsx | 1 - .../sonar-web/src/test/json/permissions/global-permissions.json | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) 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 fd209588389..8712c979465 100644 --- 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 a79c9c16aff..e710f3713b0 100644 --- 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 2d1ee99e097..3ee0d8bed14 100644 --- 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", -- 2.39.5