projects
/
osm
/
UI.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Close button on view user in user management dashboard" into projects
[osm/UI.git]
/
skyquake
/
plugins
/
project_management
/
src
/
dashboard
/
projectMgmtStore.js
diff --git
a/skyquake/plugins/project_management/src/dashboard/projectMgmtStore.js
b/skyquake/plugins/project_management/src/dashboard/projectMgmtStore.js
index
0c14dd9
..
e112bb6
100644
(file)
--- 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'],
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,
}
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 {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(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 {
role: self.roles[roleIndex]
})
} else {
- let role = projectUsers[userIndex]
.role
;
+ let role = projectUsers[userIndex]
[roleType]
;
let roleIndex = _.findIndex(role, {role:selectedRole})
let roleIndex = _.findIndex(role, {role:selectedRole})
- projectUsers[userIndex]
.role
.splice(roleIndex, 1)
+ projectUsers[userIndex]
[roleType]
.splice(roleIndex, 1)
}
self.setState({projectUsers});
}
self.setState({projectUsers});