From 058c96e87cb00852743d37fb0b135ba3bc4895f9 Mon Sep 17 00:00:00 2001
From: kamidu <sachithp@wso2.com>
Date: Fri, 7 Oct 2016 13:08:29 +0530
Subject: [PATCH] Fix for EMM-1468

---
 .../public/js/device-detail.js                    |  6 +++---
 .../app/units/mdm.unit.device.view/view.hbs       | 15 ++++++++-------
 2 files changed, 11 insertions(+), 10 deletions(-)

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 2e915a8bb..c22633373 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,10 +311,10 @@ var InitiateViewOption = null;
     $(document).ready(function () {
         $(".device-detail-body").removeClass("hidden");
         $("#loading-content").remove();
-        if ($("#tabs").data("status") !== false) {
-            loadOperationBar(deviceType, ownership, operationBarModeConstants.SINGLE);
+        if ($("#tabs").data("status")) {
+            loadOperationsLog(false);
         }
-        loadOperationsLog(false);
+        loadOperationBar(deviceType, ownership, operationBarModeConstants.SINGLE);
         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.hbs 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.hbs
index fe0163522..da48991dd 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.hbs
+++ 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.hbs
@@ -156,17 +156,19 @@
                                     </a>
                                 </li>
                             {{/if}}
-                            <li role="presentation" class="list-group-item">
-                                <a href="#event_log_tab" role="tab" data-toggle="tab" aria-controls="event_log_tab">
-                                    <i class="icon fw fw-text"></i><span class="hidden-sm">Operations Log</span>
-                                </a>
-                            </li>
+                            {{#if deviceView.isNotRemoved}}
+                                <li role="presentation" class="list-group-item">
+                                    <a href="#event_log_tab" role="tab" data-toggle="tab" aria-controls="event_log_tab">
+                                        <i class="icon fw fw-text"></i><span class="hidden-sm">Operations Log</span>
+                                    </a>
+                                </li>
+                            {{/if}}
                         </ul>
                     </div>
                     {{#defineZone "device-detail-properties"}}
                         <div class="media-body add-padding-left-5x remove-padding-xs">
                             <div class="panel-group tab-content remove-padding" id="tabs" role="tablist"
-                                 aria-multiselectable="true">
+                                 data-status="{{deviceView.isNotRemoved}}" aria-multiselectable="true">
                                 <div class="arrow-left hidden-xs"></div>
 
                                 {{#if deviceView.isNotWindows}}
@@ -428,7 +430,6 @@
                                     </div>
                                     <div class="panel-heading display-none-xs">
                                         Operations Log
-                                        &nbsp;&nbsp;
                                         <span>
                             <a href="javascript:void(0);" id="refresh-operations">
                                 <i class="fw fw-refresh"></i>