X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=skyquake%2Fplugins%2Fproject_management%2Fsrc%2Fdashboard%2FprojectMgmtStore.js;h=e112bb680a6f8a0c00c735a3549d1f1b5efb9d70;hb=6fc3e77438cd4e53c5d5f21512ee8ca260469ca8;hp=70f5f2f614dc76c05f9158affeccecab0859e9d5;hpb=0d4ddf409b399a2caa75726be8d04ce6fe89b2c8;p=osm%2FUI.git

diff --git a/skyquake/plugins/project_management/src/dashboard/projectMgmtStore.js b/skyquake/plugins/project_management/src/dashboard/projectMgmtStore.js
index 70f5f2f61..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,32 +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] = [];
             }
-            if (!projectUsers[userIndex]['rw-project-mano:mano-role']) {
-                projectUsers[userIndex]['rw-project-mano:mano-role'] = [];
-            }
-            switch (ROLES.PROJECT.TYPE[self.roles[roleIndex]]) {
-                case 'rw-project' :
-                    projectUsers[userIndex].role.push({
-                        role: selectedRole
-                    });
-                    break;
-                case 'rw-project-mano' :
-                    projectUsers[userIndex]["rw-project-mano:mano-role"].push({
-                        role: selectedRole
-                    });
-                    break;
-            }
-            projectUsers[userIndex].role.push({
-                role: selectedRole
+            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});