Merge pull request #701 from harshanL/master

Prevented device-info API calls if the device is removed

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.hbs

@@ -8,7 +8,7 @@
             <h1 class="page-sub-title device-id device-select"
                 data-deviceid="{{device.deviceIdentifier}}" data-type="{{device.type}}"
                 data-ownership="{{device.ownership}}"
-                data-owner="{{device.owner}}">
+                data-owner="{{device.owner}}" data-status="{{device.status}}">
                 Device {{device.name}}
                 {{#if device.model}}
                     <span class="lbl-device">

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/js/device-detail.js

@@ -23,6 +23,7 @@ var InitiateViewOption = null;
     var deviceIdentifier = deviceId.data("deviceid");
     var deviceType = deviceId.data("type");
     var ownership = deviceId.data("ownership");
+    var devStatus = deviceId.data("status");
     var payload = [deviceIdentifier];
     var operationTable;
     var serviceUrl;
@@ -35,7 +36,7 @@ var InitiateViewOption = null;
         serviceUrl = "/api/device-mgt/android/v1.0/admin/devices/info";
         serviceUrlLocal = "/api/device-mgt/android/v1.0/admin/devices/location";
     }
-    if (serviceUrl) {
+    if (serviceUrl && ("REMOVED" !== devStatus)) {
         invokerUtil.post(
             serviceUrl,
             payload,

components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/device-view.hbs

@@ -10,7 +10,7 @@
             <h1 class="page-sub-title device-id device-select"
                 data-deviceid="{{device.deviceIdentifier}}" data-type="{{device.type}}"
                 data-ownership="{{device.ownership}}"
-                data-owner="{{device.owner}}">
+                data-owner="{{device.owner}}" data-status="{{device.status}}">
                 Device {{device.name}}
                 {{#if device.model}}
                     <span class="lbl-device">

components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/public/js/device-detail.js

@@ -23,6 +23,7 @@ var InitiateViewOption = null;
     var deviceIdentifier = deviceId.data("deviceid");
     var deviceType = deviceId.data("type");
     var ownership = deviceId.data("ownership");
+    var devStatus = deviceId.data("status");
     var payload = [deviceIdentifier];
     var operationTable;
     var serviceUrl;
@@ -34,7 +35,7 @@ var InitiateViewOption = null;
         serviceUrl = "/api/device-mgt/android/v1.0/admin/devices/info";
     }
 
-    if (serviceUrl) {
+    if (serviceUrl && ("REMOVED" !== devStatus)) {
         invokerUtil.post(
             serviceUrl,
             payload,