X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=skyquake%2Fplugins%2Fproject_management%2Fsrc%2Fdashboard%2Fdashboard.jsx;h=8cda8026990b62fc55051719af3a8d0154984952;hb=2279bd2b93eb7cf73526ee3cc1ae299f4bcfe48e;hp=6b613cc078d742ab81be7d3b5d8fc8f2664f79e0;hpb=3d39b18290b9cb3e10c1a80d91ac4819e7c58474;p=osm%2FUI.git diff --git a/skyquake/plugins/project_management/src/dashboard/dashboard.jsx b/skyquake/plugins/project_management/src/dashboard/dashboard.jsx index 6b613cc07..8cda80269 100644 --- a/skyquake/plugins/project_management/src/dashboard/dashboard.jsx +++ b/skyquake/plugins/project_management/src/dashboard/dashboard.jsx @@ -94,13 +94,16 @@ class ProjectManagementDashboard extends React.Component { let self = this; e.preventDefault(); e.stopPropagation(); + let projectName = self.state['name']; let projectUsers = self.state.projectUsers; - let cleanUsers = this.cleanUsers(projectUsers); + let cleanUsers = this.cleanUsers(projectUsers, projectName); + this.Store.createProject({ - 'name': self.state['name'], + 'name': projectName, 'description': self.state.description, 'project-config' : { + 'name-ref': projectName, 'user': cleanUsers } }); @@ -109,18 +112,21 @@ class ProjectManagementDashboard extends React.Component { let self = this; e.preventDefault(); e.stopPropagation(); + let projectName = self.state['name']; let projectUsers = self.state.projectUsers; - let cleanUsers = this.cleanUsers(projectUsers); + let cleanUsers = this.cleanUsers(projectUsers, projectName); + this.Store.updateProject(_.merge({ - 'name': self.state['name'], + 'name': projectName, 'description': self.state.description, 'project-config' : { + 'name-ref': projectName, 'user': cleanUsers } })); } - cleanUsers(projectUsers) { + cleanUsers(projectUsers, projectName) { let cleanUsers = []; //Remove null values from role projectUsers.map((u) => { @@ -128,8 +134,10 @@ class ProjectManagementDashboard extends React.Component { u.role && u.role.map((r,i) => { let role = {}; //you may add a user without a role or a keys, but if one is present then the other must be as well. - if(!r.role || ( !r || ((r.role || r['keys']) && (!r.role || !r['keys'])))) { + if(!r.role ) { } else { + delete r.keys; + // r.keys = projectName; cleanRoles.push(r) } });