Fix for EMM-1680

revert-dabc3590
kamidu 8 years ago
parent f43ba554d5
commit 68840eae94

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

@ -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"];

Loading…
Cancel
Save