User platform role modification fix
Signed-off-by: Laurence Maultsby <laurence.maultsby@riftio.com>
diff --git a/skyquake/framework/core/modules/api/projectManagementAPI.js b/skyquake/framework/core/modules/api/projectManagementAPI.js
index 07e873d..c00de32 100644
--- a/skyquake/framework/core/modules/api/projectManagementAPI.js
+++ b/skyquake/framework/core/modules/api/projectManagementAPI.js
@@ -228,6 +228,7 @@
var api_server = req.query['api_server'];
var bodyData = req.body;
data = bodyData;
+ data.user = JSON.parse(data.user)
var updateTasks = [];
var updateUser = rp({
diff --git a/skyquake/plugins/user_management/src/platformRoleManagement/platformRoleManagement.jsx b/skyquake/plugins/user_management/src/platformRoleManagement/platformRoleManagement.jsx
index 761ce0d..de5064b 100644
--- a/skyquake/plugins/user_management/src/platformRoleManagement/platformRoleManagement.jsx
+++ b/skyquake/plugins/user_management/src/platformRoleManagement/platformRoleManagement.jsx
@@ -94,7 +94,7 @@
this.Store.updatePlatform({
- 'user': platformUsers
+ 'user': JSON.stringify(platformUsers)
}
);
}
diff --git a/skyquake/plugins/user_management/src/platformRoleManagement/platformRoleManagementSource.js b/skyquake/plugins/user_management/src/platformRoleManagement/platformRoleManagementSource.js
index 2e1f3c0..724312e 100644
--- a/skyquake/plugins/user_management/src/platformRoleManagement/platformRoleManagementSource.js
+++ b/skyquake/plugins/user_management/src/platformRoleManagement/platformRoleManagementSource.js
@@ -80,6 +80,7 @@
url: `/platform?api_server=${API_SERVER}`,
type: 'PUT',
data: project,
+ dataType: 'json',
beforeSend: Utils.addAuthorizationStub,
success: function(data, textStatus, jqXHR) {
resolve(data);
diff --git a/skyquake/plugins/user_management/src/platformRoleManagement/platformRoleManagementStore.js b/skyquake/plugins/user_management/src/platformRoleManagement/platformRoleManagementStore.js
index 326f13a..ef03b9d 100644
--- a/skyquake/plugins/user_management/src/platformRoleManagement/platformRoleManagementStore.js
+++ b/skyquake/plugins/user_management/src/platformRoleManagement/platformRoleManagementStore.js
@@ -173,7 +173,7 @@
})
} else {
let role = platformUsers[userIndex].role;
- platformUsers[userIndex].role.splice(roleIndex, 1)
+ platformUsers[userIndex].role.splice(_.findIndex(role, function(r) { return r.role == selectedRole; }), 1)
}
self.setState({platformUsers});