SONAR-6485 use "id" instead of "uuid"

diff --git a/server/sonar-web/src/main/js/apps/project-permissions/permissions.jsx b/server/sonar-web/src/main/js/apps/project-permissions/permissions.jsx
index 4638c209651d241edf23f91e4d913b091f6532ab..4ae679f345cce6b8b88113092d7f8682f0166157 100644 (file)
--- a/server/sonar-web/src/main/js/apps/project-permissions/permissions.jsx
+++ b/server/sonar-web/src/main/js/apps/project-permissions/permissions.jsx
@@ -11,7 +11,7 @@ export default React.createClass({
 
   render() {
     let projects = this.props.projects.map(p => {
-      return <Project key={p.uuid} project={p} refresh={this.props.refresh}/>
+      return <Project key={p.id} project={p} refresh={this.props.refresh}/>
     });
     return (
         <table id="projects" className="data zebra">

diff --git a/server/sonar-web/src/main/js/apps/project-permissions/project.jsx b/server/sonar-web/src/main/js/apps/project-permissions/project.jsx
index 9d7baf2b0a5a4b978c875eeb82a083c346773721..b0da14dcb182df5377554011c390586258537009 100644 (file)
--- a/server/sonar-web/src/main/js/apps/project-permissions/project.jsx
+++ b/server/sonar-web/src/main/js/apps/project-permissions/project.jsx
@@ -13,7 +13,7 @@ export default React.createClass({
     e.preventDefault();
     new GroupsView({
       permission: permission,
-      project: this.props.project.uuid,
+      project: this.props.project.id,
       projectName: this.props.project.name,
       refresh: this.props.refresh
     }).render();
@@ -23,7 +23,7 @@ export default React.createClass({
     e.preventDefault();
     new UsersView({
       permission: permission,
-      project: this.props.project.uuid,
+      project: this.props.project.id,
       projectName: this.props.project.name,
       refresh: this.props.refresh
     }).render();

diff --git a/server/sonar-web/src/test/json/permissions/project-permissions.json b/server/sonar-web/src/test/json/permissions/project-permissions.json
index 657f05042ef273a81340e74baec47c7c37838a63..92ec017304c803ba8110bbbaac498f47d093cd2a 100644 (file)
--- a/server/sonar-web/src/test/json/permissions/project-permissions.json
+++ b/server/sonar-web/src/test/json/permissions/project-permissions.json
@@ -1,7 +1,7 @@
 {
   "projects": [
     {
-      "uuid": "10c394cc-c37c-4cf0-97b9-360165c47270",
+      "id": "10c394cc-c37c-4cf0-97b9-360165c47270",
       "key": "my-project",
       "name": "My Project",
       "permissions": [
@@ -18,7 +18,7 @@
       ]
     },
     {
-      "uuid": "5d2408c9-b5c6-4426-8ee8-05be930a5f62",
+      "id": "5d2408c9-b5c6-4426-8ee8-05be930a5f62",
       "key": "another-project",
       "name": "Another Project",
       "permissions": [