diff --git a/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 b/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 index 65b3fe27d..2e915a8bb 100644 --- a/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 +++ b/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 @@ -311,7 +311,9 @@ var InitiateViewOption = null; $(document).ready(function () { $(".device-detail-body").removeClass("hidden"); $("#loading-content").remove(); - loadOperationBar(deviceType, ownership, operationBarModeConstants.SINGLE); + if ($("#tabs").data("status") !== false) { + loadOperationBar(deviceType, ownership, operationBarModeConstants.SINGLE); + } loadOperationsLog(false); loadApplicationsList(); loadPolicyCompliance(); diff --git a/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 b/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 index a5505e8f0..7c482e7b8 100644 --- a/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 +++ b/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 @@ -50,9 +50,13 @@ function onRequest(context) { if (filteredDeviceData["enrolmentInfo"]["status"]) { viewModel["status"] = filteredDeviceData["enrolmentInfo"]["status"]; viewModel.isActive = false ; + viewModel.isNotRemoved = true; if (filteredDeviceData["enrolmentInfo"]["status"]== "ACTIVE") { viewModel.isActive = true ; } + if (filteredDeviceData["enrolmentInfo"]["status"]== "REMOVED") { + viewModel.isNotRemoved = false ; + } } if (filteredDeviceData["enrolmentInfo"]["owner"]) { viewModel["owner"] = filteredDeviceData["enrolmentInfo"]["owner"];