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

Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins

Browse Source
This commit is contained in:
thusithakalugamage 2016-10-07 12:10:00 +05:30
commit caa0c99d5c
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
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

@ -311,7 +311,9 @@ 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, operationBarModeConstants.SINGLE); if ($("#tabs").data("status") !== false) {
loadOperationBar(deviceType, ownership, operationBarModeConstants.SINGLE);
}
loadOperationsLog(false); loadOperationsLog(false);
loadApplicationsList(); loadApplicationsList();
loadPolicyCompliance(); loadPolicyCompliance();

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

@ -50,9 +50,13 @@ function onRequest(context) {
if (filteredDeviceData["enrolmentInfo"]["status"]) { if (filteredDeviceData["enrolmentInfo"]["status"]) {
viewModel["status"] = filteredDeviceData["enrolmentInfo"]["status"]; viewModel["status"] = filteredDeviceData["enrolmentInfo"]["status"];
viewModel.isActive = false ; viewModel.isActive = false ;
viewModel.isNotRemoved = true;
if (filteredDeviceData["enrolmentInfo"]["status"]== "ACTIVE") { if (filteredDeviceData["enrolmentInfo"]["status"]== "ACTIVE") {
viewModel.isActive = true ; viewModel.isActive = true ;
} }
if (filteredDeviceData["enrolmentInfo"]["status"]== "REMOVED") {
viewModel.isNotRemoved = false ;
}
} }
if (filteredDeviceData["enrolmentInfo"]["owner"]) { if (filteredDeviceData["enrolmentInfo"]["owner"]) {
viewModel["owner"] = filteredDeviceData["enrolmentInfo"]["owner"]; viewModel["owner"] = filteredDeviceData["enrolmentInfo"]["owner"];