Mano roles in projects
Signed-off-by: Laurence Maultsby <laurence.maultsby@riftio.com>
diff --git a/skyquake/framework/core/modules/api/sessions.js b/skyquake/framework/core/modules/api/sessions.js
index 0c67091..ca8669b 100644
--- a/skyquake/framework/core/modules/api/sessions.js
+++ b/skyquake/framework/core/modules/api/sessions.js
@@ -104,7 +104,7 @@
project['project-config']['user'].map(function(user) {
if (user['user-name'] == username) {
project_list_for_user.push(project);
- user.role.map(function(role) {
+ user['rw-project-mano:mano-role'] && user['rw-project-mano:mano-role'].map(function(role) {
if(role.role.indexOf('rw-project-mano:lcm') > -1) {
isLCM = true;
}
diff --git a/skyquake/plugins/project_management/src/dashboard/dashboard.jsx b/skyquake/plugins/project_management/src/dashboard/dashboard.jsx
index e9847e5..f8018d5 100644
--- a/skyquake/plugins/project_management/src/dashboard/dashboard.jsx
+++ b/skyquake/plugins/project_management/src/dashboard/dashboard.jsx
@@ -322,9 +322,13 @@
<tbody>
{
state.projectUsers.map((u,i)=> {
- let userRoles = u.role && u.role.map((r) => {
- return r.role;
- }) || [];
+ let userRoles = []
+ u.role && u.role.map((r) => {
+ userRoles.push(r.role);
+ });
+ u["rw-project-mano:mano-role"] && u["rw-project-mano:mano-role"].map((r) => {
+ userRoles.push(r.role);
+ });
return (
<tr key={i}>
{!state.isReadOnly ? <td><span
diff --git a/skyquake/skyquake.js b/skyquake/skyquake.js
index 6019357..685f049 100644
--- a/skyquake/skyquake.js
+++ b/skyquake/skyquake.js
@@ -1,3 +1,5 @@
+
+
/*
*
* Copyright 2016 RIFT.IO Inc