community/device-mgt-plugins
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-plugins.git synced 2025-09-16 23:42:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX for JIRAS: https://wso2.org/jira/browse/EMM-1633

Browse Source
This commit is contained in:
dilanua 2016-09-26 19:52:54 +05:30
parent e3a08d824a
commit 17e7b92b23
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-bar/public/js/operation-bar.js
View File

@ -35,6 +35,10 @@ var operations = '.wr-operations',
ownershipTypeConstants = { ownershipTypeConstants = {
"BYOD": "BYOD", "BYOD": "BYOD",
"COPE": "COPE" "COPE": "COPE"
},
operationBarModeConstants = {
"BULK": "BULK_OPERATION_MODE",
"SINGLE": "SINGLE_OPERATION_MODE"
}; };
/* /*
@ -103,7 +107,7 @@ function getDevicesByTypes(deviceList) {
// $(".wr-operations").html(""); // $(".wr-operations").html("");
//} //}
function loadOperationBar(deviceType, ownership) { function loadOperationBar(deviceType, ownership, mode) {
var operationBar = $("#operations-bar"); var operationBar = $("#operations-bar");
var operationBarSrc = operationBar.attr("src"); var operationBarSrc = operationBar.attr("src");
@ -121,9 +125,20 @@ function loadOperationBar(deviceType, ownership) {
var j; var j;
for (j = 0; j < totalFeatures.length; j++) { for (j = 0; j < totalFeatures.length; j++) {
if (permissionList[deviceType][i] == totalFeatures[j]["code"]) { if (permissionList[deviceType][i] == totalFeatures[j]["code"]) {
if (deviceType == platformTypeConstants.ANDROID && if (deviceType == platformTypeConstants.ANDROID) {
totalFeatures[j]["code"] == "DEVICE_UNLOCK") { if (totalFeatures[j]["code"] == "DEVICE_UNLOCK") {
if (ownership == ownershipTypeConstants.COPE) { if (ownership == ownershipTypeConstants.COPE) {
permittedOperations.push(totalFeatures[j]);
}
} else if (totalFeatures[j]["code"] == "WIPE_DATA") {
if (mode == operationBarModeConstants.BULK) {
if (ownership == ownershipTypeConstants.COPE) {
permittedOperations.push(totalFeatures[j]);
}
} else {
permittedOperations.push(totalFeatures[j]);
}
} else {
permittedOperations.push(totalFeatures[j]); permittedOperations.push(totalFeatures[j]);
} }
} else { } else {

2
components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/public/js/device-detail.js
View File

@ -292,7 +292,7 @@ var InitiateViewOption = null;
$(document).ready(function () { $(document).ready(function () {
$(".device-detail-body").removeClass("hidden"); $(".device-detail-body").removeClass("hidden");
$("#loading-content").remove(); $("#loading-content").remove();
loadOperationBar(deviceType, ownership); loadOperationBar(deviceType, ownership, operationBarModeConstants.SINGLE);
loadOperationsLog(false); loadOperationsLog(false);
loadApplicationsList(); loadApplicationsList();
loadPolicyCompliance(); loadPolicyCompliance();