From 9dfd06f95e3c0967fd2e3168dd7f5d183eb4edcb Mon Sep 17 00:00:00 2001
From: dilanua <dilan.u.ariyaratne@gmail.com>
Date: Wed, 28 Sep 2016 15:44:32 +0530
Subject: [PATCH] Fix for JIRA: https://wso2.org/jira/browse/EMM-1650

---
 .../mdm.page.devices/public/js/device-listing.js     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/public/js/device-listing.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/public/js/device-listing.js
index a6d271147b..fbc60b3a17 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/public/js/device-listing.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/public/js/device-listing.js
@@ -112,7 +112,7 @@ function loadDevices() {
                         user: data.devices[index].enrolmentInfo.owner,
                         status: data.devices[index].enrolmentInfo.status,
                         ownership: data.devices[index].enrolmentInfo.ownership,
-                        deviceType: data.devices[index].type,
+                        type: data.devices[index].type,
                         deviceIdentifier: data.devices[index].deviceIdentifier,
                         name : data.devices[index].name
                     }
@@ -133,7 +133,7 @@ function loadDevices() {
     // possible params - nRow, aData, dataIndex
     var fnCreatedRow = function (nRow, aData) {
         $(nRow).attr('data-type', 'selectable');
-        $(nRow).attr('data-devicetype', aData["deviceType"]);
+        $(nRow).attr('data-devicetype', aData["type"]);
         $(nRow).attr('data-deviceid', aData["deviceIdentifier"]);
     };
 
@@ -142,7 +142,7 @@ function loadDevices() {
             class : 'remove-padding icon-only content-fill viewEnabledIcon',
             data : null,
             render: function (data, type, row) {
-                var deviceType = row.deviceType;
+                var deviceType = row.type;
                 var deviceIdentifier = row.deviceIdentifier;
                 var url = "#";
                 if (row.status != 'REMOVED') {
@@ -197,9 +197,9 @@ function loadDevices() {
         },
         {
             className: 'fade-edge remove-padding-top',
-            data: 'deviceType',
-            render: function (deviceType) {
-                return '<div><label class="label-bold">Type&nbsp;:&nbsp;&nbsp;</label>' + deviceType + '</div>';
+            data: 'type',
+            render: function (type) {
+                return '<div><label class="label-bold">Type&nbsp;:&nbsp;&nbsp;</label>' + type + '</div>';
             }
         },
         {