From f47a1cdc55c17151559404a630b7c0c8d587912e Mon Sep 17 00:00:00 2001
From: dilanua <dilan.u.ariyaratne@gmail.com>
Date: Thu, 22 Sep 2016 22:59:42 +0530
Subject: [PATCH] Fix for JIRA: https://wso2.org/jira/browse/EMM-1614

---
 .../app/units/mdm.unit.device.view/view.hbs   | 20 +++++++++++--------
 .../app/units/mdm.unit.device.view/view.js    |  2 ++
 2 files changed, 14 insertions(+), 8 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/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 67f86d7b5..beaad78c8 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
@@ -23,16 +23,20 @@
                     {{#defineZone "device-detail-properties"}}
                         <table class="table table-responsive table-striped" id="members">
                             <tbody>
-                            <tr role="row" class="even">
-                                <td class="sorting_1" style="padding:10px 15px; width: 1%;">Device</td>
-                                <td style="padding:10px 15px;">{{device.viewModel.vendor}} {{device.properties.model}}</td>
-                            </tr>
-                            {{#if device.viewModel.model}}
-                                <tr role="row" class="odd">
-                                    <td class="sorting_1" style="padding:10px 15px;">Model</td>
-                                    <td style="padding:10px 15px;">{{device.viewModel.model}}</td>
+                            {{#if device.viewModel.vendor}}
+                                <tr role="row" class="even">
+                                    <td class="sorting_1" style="padding:10px 15px; width: 1%;">Device</td>
+                                    <td style="padding:10px 15px;">{{device.viewModel.deviceName}}</td>
                                 </tr>
                             {{/if}}
+                            {{#if device.viewModel.vendor}}
+                                {{#if device.viewModel.model}}
+                                    <tr role="row" class="odd">
+                                        <td class="sorting_1" style="padding:10px 15px;">Model</td>
+                                        <td style="padding:10px 15px;">{{device.viewModel.vendor}} {{device.viewModel.model}}</td>
+                                    </tr>
+                                {{/if}}
+                            {{/if}}
                             <tr role="row" class="even">
                                 <td class="sorting_1" style="padding:10px 15px;">IMEI</td>
                                 <td style="padding:10px 15px;">{{device.viewModel.imei}}</td>
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.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/view.js
index ecb98e08f..65a2e5fba 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.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/view.js
@@ -52,6 +52,8 @@ function onRequest(context) {
                         longitude: device["properties"]["LONGITUDE"]
                     };
                 } else if (device["type"] == "android") {
+                    viewModel["deviceName"] = device["name"];
+                    viewModel["deviceIdentifier"] = device["deviceIdentifier"];
                     viewModel["imei"] = device["properties"]["IMEI"];
                     viewModel["model"] = device["deviceInfo"]["deviceModel"];
                     viewModel["vendor"] = device["deviceInfo"]["vendor"];