From fcd68eab59130a54de6afaee7eafad45c80eb88f Mon Sep 17 00:00:00 2001
From: dilanua <dilan.u.ariyaratne@gmail.com>
Date: Mon, 15 Aug 2016 18:37:51 +0530
Subject: [PATCH] Fixing owner undefined issue in device view

---
 .../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 a515fbd0d..bb247219d 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
@@ -222,9 +222,9 @@ function loadDevices(searchType, searchParam){
             }
         },{
             class: 'fade-edge remove-padding-top',
-            data: 'user',
-            render: function ( user, type, row, meta ) {
-                return '<div><label class="label-bold">Owner</label>' + user + '</div>';
+            data: 'owner',
+            render: function ( owner, type, row, meta ) {
+                return '<div><label class="label-bold">Owner&nbsp;:&nbsp;</label>' + owner + '</div>';
             }
         },{
             class: 'fade-edge remove-padding-top',
@@ -245,19 +245,19 @@ function loadDevices(searchType, searchParam){
                         html = '<span><i class="fw fw-delete icon-danger"></i> Removed</span>';
                         break;
                 }
-                return '<div><label class="label-bold">Status</label>'+html+'</div>';
+                return '<div><label class="label-bold">Status&nbsp;:&nbsp;</label>'+html+'</div>';
             }
         },{
             className: 'fade-edge remove-padding-top',
             data: 'deviceType',
             render: function ( deviceType, type, row, meta ) {
-                return '<div><label class="label-bold">Type</label>' + deviceType + '</div>';
+                return '<div><label class="label-bold">Type&nbsp;:&nbsp;</label>' + deviceType + '</div>';
             }
         },{
             className: 'fade-edge remove-padding-top',
             data: 'ownership',
             render: function ( ownership, type, row, meta ) {
-                return '<div><label class="label-bold">Ownership</label>' + ownership + '</div>';
+                return '<div><label class="label-bold">Ownership&nbsp;:&nbsp;</label>' + ownership + '</div>';
             }
         }
     ];