From 33e57efc3deb3576e0d97c9c950c725671c28af3 Mon Sep 17 00:00:00 2001
From: Dunith Dhanushka <dunithd@gmail.com>
Date: Fri, 13 Jan 2017 20:25:03 +0530
Subject: [PATCH 1/2] Replacing JSON object with comma separated values

---
 .../cdmf.unit.device.type.android.device-view/device-view.hbs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/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 b/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
index ca9a91d54..4d6672255 100644
--- a/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
+++ b/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
@@ -339,7 +339,7 @@
                             </div>
                             <br/>
                             <a class="padding-left"
-                               href="{{portalUrl}}/portal/dashboards/geo-dashboard/?GLOBAL-STATE={{anchor}}">
+                               href="{{portalUrl}}/portal/dashboards/geo-dashboard/?GLOBAL-STATE={{deviceId}},{{deviceType}}">
                                 <span class="fw-stack">
                                     <i class="fw fw-circle-outline fw-stack-2x"></i>
                                     <i class="fw fw-map-location fw-stack-1x"></i>
@@ -439,4 +439,4 @@
         {{js "js/device-detail.js"}}
         {{js "js/load-map.js"}}
     {{/if}}
-{{/zone}}
\ No newline at end of file
+{{/zone}}

From a097482b9179b711372c9b75525a476d492ca1f9 Mon Sep 17 00:00:00 2001
From: Dunith Dhanushka <dunithd@gmail.com>
Date: Fri, 13 Jan 2017 20:26:13 +0530
Subject: [PATCH 2/2] Passing deviceId and deviceType into view

---
 .../cdmf.unit.device.type.android.device-view/device-view.js  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/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.js b/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.js
index ee7726477..c192718e8 100644
--- a/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.js
+++ b/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.js
@@ -213,7 +213,7 @@ function onRequest(context) {
     deviceViewData["autoCompleteParams"] = autoCompleteParams;
 
     deviceViewData["portalUrl"] = devicemgtProps['portalURL'];
-    var anchor = { "device" : { "id" : deviceId, "type" : deviceType}};
-    deviceViewData["anchor"] = JSON.stringify(anchor);
+    deviceViewData["deviceId"] = deviceId;
+    deviceViewData["deviceType"] = deviceType;
     return deviceViewData;
 }