X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=skyquake%2Fplugins%2Fproject_management%2Fsrc%2Fdashboard%2FprojectMgmtStore.js;h=e112bb680a6f8a0c00c735a3549d1f1b5efb9d70;hb=08e8a038f222c66ce6f55760a766e90b87b3c50b;hp=b3e55ad6ce395d96efa5dac756af7036d5d505f6;hpb=a70db5e18343f33d04c86455c52be80f56457e1a;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 b3e55ad6c..e112bb680 100644
--- a/skyquake/plugins/project_management/src/dashboard/projectMgmtStore.js
+++ b/skyquake/plugins/project_management/src/dashboard/projectMgmtStore.js
@@ -16,7 +16,9 @@ export default class ProjectManagementStore {
         this.projectUsers = [];
         this.selectedUser = null;
         this.selectedRole = null;
-        this.roles = Object.keys(ROLES.PROJECT).map((p) => {
+        this.roles = Object.keys(ROLES.PROJECT).filter((p) => {
+            return p != "TYPE";
+        }).map((p) => {
             return ROLES.PROJECT[p];
         })
         // this.roles = ['rw-project:project-admin', 'rw-project:project-oper', 'rw-project:project-create'];
@@ -67,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,
@@ -171,15 +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 = [];
-            projectUsers[userIndex].role.push({
+            if (!projectUsers[userIndex][roleType]) {
+                projectUsers[userIndex][roleType] = [];
+            }
+            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});