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

Removed hardcoded admin user name.

Browse Source
This commit is contained in:
Menaka Jayawardena 2017-08-31 17:24:12 +05:30
parent b04bb5f1f1
commit 21b0ed284b
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
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

@ -150,8 +150,7 @@ function loadRoles() {
var innerhtml = '';
//TODO: Remove the hardcoded admin role name.
var isAdmin = data.name === 'admin';
var isAdminRole = $("#role-table").data("role") === data.name;
var editLink = '<a onclick="javascript:loadRoleBasedActionURL(\'edit\', \'' + data.name + '\')" ' +
'data-role="' + data.name + '" ' +
@ -199,7 +198,7 @@ function loadRoles() {
'<span class="hidden-xs hidden-on-grid-view">Remove</span>' +
'</a>';
if (!isCloud && !isAdmin) {
if (!isCloud && !isAdminRole) {
innerhtml = editLink + editPermissionLink + removeLink;
}
return innerhtml;

4
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.view/view.js
View File

@ -46,9 +46,9 @@ function onRequest(context) {
canView = true;
}
//TODO: Remove hardcoded admin user name.
var canEdit = false;
if (userModule.isAuthorized("/permission/admin/device-mgt/users/edit") && userName !== 'admin') {
if (userModule.isAuthorized("/permission/admin/device-mgt/users/edit") &&
userName !== deviceMgtProps['adminUser'].split("@")[0]) {
canEdit = true;
}