community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing EMM-1755

Browse Source
This commit is contained in:
Megala 2016-10-16 13:24:32 +05:30
parent d5c62f74dc
commit d9ec203727
3 changed files with 11 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.role.edit/edit.json
View File

@ -1,5 +1,5 @@
{
"version": "1.0.0",
"uri": "/role/edit/{+any}",
"uri": "/role/edit/",
"layout": "cdmf.layout.default"
}

2
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/public/js/role-listing.js
View File

@ -17,7 +17,7 @@
*/
var loadRoleBasedActionURL = function (action, rolename) {
var href = $("#ast-container").data("app-context") + "role/" + action + "/" + rolename;
href = $("#ast-container").data("app-context") + "role/" + action + "/?rolename=" + encodeURIComponent(rolename);
$(location).attr('href', href);
};

31
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.edit/edit.js
View File

@ -26,32 +26,19 @@ function onRequest(context) {
var userModule = require("/app/modules/business-controllers/user.js")["userModule"];
var deviceMgtProps = require("/app/modules/conf-reader/main.js")["conf"];
var uri = request.getRequestURI();
var uriMatcher = new URIMatcher(String(uri));
var isMatched = uriMatcher.match("/{context}/role/edit/{roleName}") ||
uriMatcher.match("/{context}/role/edit/{userStoreName}/{roleName}");
var matchedElements;
var roleName;
var roleName = request.getParameter("rolename");
var response;
var userStore;
if (isMatched) {
if (uriMatcher.match("/{context}/role/edit/{roleName}")) {
matchedElements = uriMatcher.elements();
roleName = matchedElements["roleName"];
response = userModule.getRole(roleName);
if (response["status"] == "success") {
context["role"] = response["content"];
}
if (roleName) {
if (roleName.indexOf("/") > -1) {
userStore = roleName.substr(0, roleName.indexOf("/"));
} else {
userStore = "PRIMARY";
} else if (uriMatcher.match("/{context}/role/edit/{userStoreName}/{roleName}")) {
matchedElements = uriMatcher.elements();
roleName = matchedElements["roleName"];
userStore = matchedElements["userStoreName"];
response = userModule.getRole(userStore + "/" + roleName);
if (response["status"] == "success") {
context["role"] = response["content"];
}
}
response = userModule.getRole(roleName);
if (response["status"] == "success") {
context["role"] = response["content"];
}
context["userStore"] = userStore;
context["roleNameJSRegEx"] = deviceMgtProps["roleValidationConfig"]["roleNameJSRegEx"];