diff options
| author | Stas Vilchik <vilchiks@gmail.com> | 2015-08-27 16:27:17 +0200 |
|---|---|---|
| committer | Teryk Bellahsene <teryk.bellahsene@sonarsource.com> | 2015-08-27 16:52:33 +0200 |
| commit | aba9715aa0e4fcf433f3f7639098823e95db8c83 (patch) | |
| tree | 90b7e5d7aa0c46f43ea554ef6fdcbc8e3c909d09 | |
| parent | 4d08ae84be368871885db709b830399d5f5c4715 (diff) | |
| download | sonarqube-aba9715aa0e4fcf433f3f7639098823e95db8c83.tar.gz sonarqube-aba9715aa0e4fcf433f3f7639098823e95db8c83.zip | |
SONAR-6485 use "id" instead of "uuid"
3 files changed, 5 insertions, 5 deletions
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 4638c209651..4ae679f345c 100644 --- 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 9d7baf2b0a5..b0da14dcb18 100644 --- 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 657f05042ef..92ec017304c 100644 --- 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": [ |