Allow upload/update through session manager

Signed-off-by: Laurence Maultsby <laurence.maultsby@riftio.com>

diff --git a/skyquake/framework/core/modules/routes/navigation.js b/skyquake/framework/core/modules/routes/navigation.js
index 3f460e6..1d7b901 100644 (file)
--- a/skyquake/framework/core/modules/routes/navigation.js
+++ b/skyquake/framework/core/modules/routes/navigation.js
@@ -41,8 +41,8 @@ Router.get('/login.html', cors(), function(req, res) {
        res.render('login.html');
        res.end();
 });
-
-Router.use(/^\/(?!session).*/, function(req, res, next) {
+//Should have a way of adding excluded routes to this via plugin registry, instead of hard coding
+Router.use(/^(?!.*(session|composer\/upload|composer\/update)).*/, function(req, res, next) {
        var api_server = req.query['api_server'] || (req.protocol + '://' + configurationAPI.globalConfiguration.get().api_server);
        if (req.session && req.session.loggedIn) {
                next();

diff --git a/skyquake/plugins/project_management/src/dashboard/dashboard.jsx b/skyquake/plugins/project_management/src/dashboard/dashboard.jsx
index 8ddc365..66c3f48 100644 (file)
--- a/skyquake/plugins/project_management/src/dashboard/dashboard.jsx
+++ b/skyquake/plugins/project_management/src/dashboard/dashboard.jsx
@@ -132,6 +132,7 @@ class ProjectManagementDashboard extends React.Component {
         });
     }
     cleanUsers(projectUsers, projectName) {
+        let self = this;
         let cleanUsers = [];
         //Remove null values from role
         projectUsers.map((u) => {
@@ -152,7 +153,9 @@ class ProjectManagementDashboard extends React.Component {
            u.role = cleanRoles;
            u["rw-project-mano:mano-role"] = u["rw-project-mano:mano-role"] || [];
            u["rw-project-mano:mano-role"] = u["rw-project-mano:mano-role"].concat(cleanManoRoles);
-           cleanUsers.push(u);
+           if (u['user-name'] != self.context.userProfile.userId) {
+                cleanUsers.push(u);
+           }
         });
         return cleanUsers;
     }
@@ -390,7 +393,8 @@ class ProjectManagementDashboard extends React.Component {
 }
 // onClick={this.Store.update.bind(null, Account)}
 ProjectManagementDashboard.contextTypes = {
-    router: React.PropTypes.object
+    router: React.PropTypes.object,
+    userProfile: React.PropTypes.object
 };
 
 ProjectManagementDashboard.defaultProps = {