From 0290c710e1b3b36387a54dc017ac228df6f0c417 Mon Sep 17 00:00:00 2001
From: Rasika Perera <info.rasika@gmail.com>
Date: Mon, 3 Oct 2016 10:09:15 +0530
Subject: [PATCH 1/2] Fixing enrollment url for device types

---
 .../public/templates/listing.hbs                              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.types.listing/public/templates/listing.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.types.listing/public/templates/listing.hbs
index f243c444f4..3d17d9a10f 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.types.listing/public/templates/listing.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.types.listing/public/templates/listing.hbs
@@ -1,5 +1,5 @@
 <tr data-type="selectable" data-deviceid="{{deviceTypeId}}" data-devicetype="{{deviceTypeName}}"
-    data-href="{{@app.context}}/device/{{deviceTypeName}}/enroll" class="clickable-row">
+    data-href="{{appContext}}/device/{{deviceTypeName}}/enroll" class="clickable-row">
     <td class="remove-padding icon-only content-fill" data-search="{{deviceCategory}}" data-display="{{deviceCategory}}">
         <div class="thumbnail icon">
                 <!--<i class="square-element text fw fw-mobile"></i>-->
@@ -9,7 +9,7 @@
     <td class="remove-padding-top" data-search="{{deviceTypeLabel}}" data-display="{{deviceTypeLabel}}">
         {{deviceTypeLabel}}</td>
     <td class="text-right content-fill text-left-on-grid-view no-wrap">
-        <a href="{{@app.context}}/device/{{deviceTypeName}}/enroll"
+        <a href="{{appContext}}/device/{{deviceTypeName}}/enroll"
            data-click-event="remove-form" class="btn col-md-12">
                             <span class="fw-stack">
                                 <i class="fw fw-ring fw-stack-2x"></i>

From 35c23174be8062243505855792653e9d9444a771 Mon Sep 17 00:00:00 2001
From: Rasika Perera <info.rasika@gmail.com>
Date: Mon, 3 Oct 2016 16:04:12 +0530
Subject: [PATCH 2/2] Fixing android sense download issue

---
 .../main/resources/jaggeryapps/devicemgt/app/conf/config.json   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json
index 9625762d80..97b955ae7d 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json
@@ -61,7 +61,7 @@
         "roleNameHelpMsg" : "should be in minimum 3 characters long and do not include any whitespaces."
     },
     "generalConfig" : {
-        "host" : "https://localhost:9443",
+        "host" : "%http.ip%",
         "companyName" : "WSO2 Carbon Device Manager",
         "browserTitle" : "WSO2 Device Manager",
         "copyrightPrefix" : "\u00A9 %date-year%, ",