projects
/
osm
/
UI.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Row striping for platform roles, users, and 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
f0a8eeb
..
e112bb6
100644
(file)
--- 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.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'];
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'],
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,
@@
-79,9
+81,7
@@
export default class ProjectManagementStore {
}
editProject(isReadOnly) {
this.viewProject([this.projects[this.activeIndex], this.activeIndex, isReadOnly]);
}
editProject(isReadOnly) {
this.viewProject([this.projects[this.activeIndex], this.activeIndex, isReadOnly]);
- // this.setState({
- // isReadOnly: isEdit
- // })
+
}
handleCloseProjectPanel() {
this.setState({
}
handleCloseProjectPanel() {
this.setState({
@@
-173,15
+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 = [];
- projectUsers[userIndex].role.push({
+ if (!projectUsers[userIndex][roleType]) {
+ projectUsers[userIndex][roleType] = [];
+ }
+ 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});