X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FUI.git;a=blobdiff_plain;f=skyquake%2Fplugins%2Fproject_management%2Fsrc%2Fdashboard%2FprojectMgmtStore.js;fp=skyquake%2Fplugins%2Fproject_management%2Fsrc%2Fdashboard%2FprojectMgmtStore.js;h=e112bb680a6f8a0c00c735a3549d1f1b5efb9d70;hp=0c14dd906d4ba2464807786af91f014ca0dab571;hb=cefb13b7e32e68315f5f246ff27010315c830834;hpb=407555cd9dac9e0dd9889da18082ae275a0a44fd diff --git a/skyquake/plugins/project_management/src/dashboard/projectMgmtStore.js b/skyquake/plugins/project_management/src/dashboard/projectMgmtStore.js index 0c14dd906..e112bb680 100644 --- a/skyquake/plugins/project_management/src/dashboard/projectMgmtStore.js +++ b/skyquake/plugins/project_management/src/dashboard/projectMgmtStore.js @@ -69,7 +69,7 @@ export default class ProjectManagementStore { let ProjectData = { 'name': project['name'], 'description': project['description'], - 'projectUsers': project['project-config'] && project['project-config']['user'] || [] + 'projectUsers': (project['project-config'] && project['project-config']['user'] || []) } let state = _.merge({ activeIndex: projectIndex, @@ -173,17 +173,19 @@ export default class ProjectManagementStore { let {userIndex, roleIndex, checked} = data; let projectUsers = this.projectUsers; let selectedRole = self.roles[roleIndex]; + let roleType = (ROLES.PROJECT.TYPE[selectedRole] == 'rw-project-mano') ? "rw-project-mano:mano-role" : "role"; + // if(checked) { - if (!projectUsers[userIndex].role) { - projectUsers[userIndex].role = []; + if (!projectUsers[userIndex][roleType]) { + projectUsers[userIndex][roleType] = []; } - projectUsers[userIndex].role.push({ + projectUsers[userIndex][roleType].push({ role: self.roles[roleIndex] }) } else { - let role = projectUsers[userIndex].role; + let role = projectUsers[userIndex][roleType]; let roleIndex = _.findIndex(role, {role:selectedRole}) - projectUsers[userIndex].role.splice(roleIndex, 1) + projectUsers[userIndex][roleType].splice(roleIndex, 1) } self.setState({projectUsers});