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

Fix for Jira : EMM-1682 and EMM-1653

Browse Source
This commit is contained in:
kamidu 2016-10-10 18:27:53 +05:30
parent 2f852d84f4
commit 8c94e83431
2 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,13 +5,14 @@
<i class="square-element text fw fw-user"></i>
</div>
</td>
<td class="fade-edge remove-padding-top" >{{roleName}}</td>
<td class="fade-edge remove-padding-top">{{roleName}}</td>
<td class="text-right content-fill text-left-on-grid-view no-wrap">
{{#unequal adminRole roleName }}
{{#if canEdit}}
<a onclick="javascript:loadRoleBasedActionURL('edit', '{{roleName}}')" data-role="{{roleName}}" data-click-event="edit-form"
class="btn padding-reduce-on-grid-view edit-role-link">
{{#if canEdit}}
<a onclick="javascript:loadRoleBasedActionURL('edit', '{{roleName}}')" data-role="{{roleName}}"
data-click-event="edit-form"
class="btn padding-reduce-on-grid-view edit-role-link" title="Edit Role">
<span class="fw-stack fw-lg">
<i class="fw fw-ring fw-stack-2x"></i>
<i class="fw fw-user fw-stack-1x"></i>
@ -21,10 +22,12 @@
<i class="fw fw-edit fw-stack-1x fw-inverse"></i>
</span>
</span>
<span class="hidden-xs hidden-on-grid-view">Edit</span>
</a>
<a onclick="javascript:loadRoleBasedActionURL('edit-permission', '{{roleName}}')" data-role="{{roleName}}"
data-click-event="edit-form" class="btn padding-reduce-on-grid-view edit-permission-link">
<span class="hidden-xs hidden-on-grid-view">Edit</span>
</a>
<a onclick="javascript:loadRoleBasedActionURL('edit-permission', '{{roleName}}')"
data-role="{{roleName}}"
data-click-event="edit-form" class="btn padding-reduce-on-grid-view edit-permission-link"
title="Edit Role Permissions">
<span class="fw-stack fw-lg">
<i class="fw fw-ring fw-stack-2x"></i>
<i class="fw fw-security-policy fw-stack-1x"></i>
@ -34,18 +37,19 @@
<i class="fw fw-edit fw-stack-1x fw-inverse"></i>
</span>
</span>
<span class="hidden-xs hidden-on-grid-view">Edit Permission</span>
</a>
{{/if}}
{{#if canRemove}}
<a data-role="{{roleName}}" data-click-event="remove-form" class="btn padding-reduce-on-grid-view remove-role-link">
<span class="hidden-xs hidden-on-grid-view">Edit Permission</span>
</a>
{{/if}}
{{#if canRemove}}
<a data-role="{{roleName}}" data-click-event="remove-form"
class="btn padding-reduce-on-grid-view remove-role-link" title="Remove Role">
<span class="fw-stack">
<i class="fw fw-ring fw-stack-2x"></i>
<i class="fw fw-delete fw-stack-1x"></i>
</span>
<span class="hidden-xs hidden-on-grid-view">Remove</span>
</a>
{{/if}}
<span class="hidden-xs hidden-on-grid-view">Remove</span>
</a>
{{/if}}
{{/unequal}}
</td>
</tr>

7
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.user-menu/public/js/user-menu.js
View File

@ -31,8 +31,8 @@ function inputIsValid(regExp, inputString) {
/*
* Fix for the modal popup overlay disappear bug
*/
$('.modal').on('hidden.bs.modal',function(){
if($('.modal-backdrop').length == 2){
$('.modal').on('hidden.bs.modal', function () {
if ($('.modal-backdrop').length == 2) {
$('.modal-backdrop')[0].remove()
}
});
@ -92,7 +92,8 @@ $(document).ready(function () {
$(errorMsg).text("Your current password does not match with the provided value.");
$(errorMsgWrapper).removeClass("hidden");
} else {
$(errorMsg).text("An unexpected error occurred. Please try again later.");
var response = JSON.parse(jqXHR.responseText).message;
$(errorMsg).text(response);
$(errorMsgWrapper).removeClass("hidden");
}
}