From 6656f9e6f09761577d8f4a3d7ab85db63612478d Mon Sep 17 00:00:00 2001
From: charitha <charitha.ws@gmail.com>
Date: Wed, 22 Mar 2017 15:04:21 +0530
Subject: [PATCH 1/3] Add support for hybrid device types which has
 emulation/virtual capabilities

(cherry picked from commit 78b7037)
---
 .../listing.hbs                               |  6 +++---
 .../cdmf.unit.device.types.listing/listing.js | 20 +++++++++++++++++++
 2 files changed, 23 insertions(+), 3 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/listing.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.types.listing/listing.hbs
index d40bb52ada0..b51e7f0eb87 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.types.listing/listing.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.types.listing/listing.hbs
@@ -67,11 +67,11 @@
         <div class="try-device-container" id="{{deviceTypeName}}">
             <div class="message message-info try-device-message">
                 <p class="try-device-text">
-                    <button id="{{deviceTypeName}}_btn" onclick="location.href='{{@app
-                    .context}}/device/{{deviceTypeName}}/enroll'"
+                    <button id="{{deviceTypeName}}_btn"
+                            onclick="location.href='{{@app.context}}/device/{{deviceTypeName}}/enroll?type=virtual'"
                             class="btn btn-default btn-primary">Try
                     </button>
-                                           our {{deviceTypeLabel}} device
+                    our {{deviceTypeLabel}} device
                 </p>
                 <img class="try-device-image" src="{{thumb}}">
             </div>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.types.listing/listing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.types.listing/listing.js
index 1e1cefcb83c..9b0cdacddbc 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.types.listing/listing.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.types.listing/listing.js
@@ -21,6 +21,7 @@ function onRequest(context) {
     var DTYPE_CONF_DEVICE_TYPE_KEY = "deviceType";
     var DTYPE_CONF_DEVICE_CATEGORY = "category";
     var DTYPE_CONF_DEVICE_TYPE_LABEL_KEY = "label";
+    var DTYPE_CONF_VIRTUAL_DEVICE_TYPE_LABEL_KEY = "virtualLabel";
 
     var viewModel = {};
     var deviceModule = require("/app/modules/business-controllers/device.js")["deviceModule"];
@@ -54,6 +55,25 @@ function onRequest(context) {
                                                     "deviceCategory": deviceCategory,
                                                     "thumb": utility.getDeviceThumb(deviceType)
                                                 });
+                } else if (deviceCategory == 'hybrid') {
+                    var virtualLabel = configs[DTYPE_CONF_DEVICE_TYPE_KEY][DTYPE_CONF_VIRTUAL_DEVICE_TYPE_LABEL_KEY];
+                    if (!virtualLabel) {
+                        virtualLabel = deviceTypeLabel;
+                    }
+                    virtualDeviceTypesList.push({
+                                                    "hasCustTemplate": false,
+                                                    "deviceTypeLabel": virtualLabel,
+                                                    "deviceTypeName": deviceType,
+                                                    "deviceCategory": deviceCategory,
+                                                    "thumb": utility.getDeviceThumb(deviceType)
+                                                });
+                    deviceTypesList.push({
+                                             "hasCustTemplate": false,
+                                             "deviceTypeLabel": deviceTypeLabel,
+                                             "deviceTypeName": deviceType,
+                                             "deviceCategory": deviceCategory,
+                                             "thumb": utility.getDeviceThumb(deviceType)
+                                         });
                 } else {
                     deviceTypesList.push({
                                              "hasCustTemplate": false,

From da69bc9fe53af79b056e08b86477edebe068c0a7 Mon Sep 17 00:00:00 2001
From: Madawa Soysa <madawa.rc@gmail.com>
Date: Thu, 23 Mar 2017 11:06:52 +0530
Subject: [PATCH 2/3] Allowing configuration management in cloud environment

---
 .../app/units/cdmf.unit.ui.navbar.nav-menu/nav-menu.hbs       | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/nav-menu.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/nav-menu.hbs
index 78aa84e0016..1302e101db9 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/nav-menu.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/nav-menu.hbs
@@ -87,7 +87,6 @@
         <li><a href="{{@app.context}}/policies"><i class="fw fw-policy"></i>Policy Management</a></li>
     {{/if}}
 
-    {{#unless isCloud}}
     {{#if permissions.TENANT_CONFIGURATION}}
         <li><a><i class="fw fw-settings"></i>Configuration Management</a>
             <ul>
@@ -99,9 +98,6 @@
             </ul>
         </li>
     {{/if}}
-    {{/unless}}
-
-
 
 {{/zone}}
 

From d468ac07d083bf0917fb628e3fd32fe7e6f5d24d Mon Sep 17 00:00:00 2001
From: Harshan Liyanage <harshan@wso2.com>
Date: Thu, 23 Mar 2017 11:12:15 +0530
Subject: [PATCH 3/3] Revert "Allowing configuration management in cloud
 environment"

---
 .../app/units/cdmf.unit.ui.navbar.nav-menu/nav-menu.hbs       | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/nav-menu.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/nav-menu.hbs
index 1302e101db9..78aa84e0016 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/nav-menu.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/nav-menu.hbs
@@ -87,6 +87,7 @@
         <li><a href="{{@app.context}}/policies"><i class="fw fw-policy"></i>Policy Management</a></li>
     {{/if}}
 
+    {{#unless isCloud}}
     {{#if permissions.TENANT_CONFIGURATION}}
         <li><a><i class="fw fw-settings"></i>Configuration Management</a>
             <ul>
@@ -98,6 +99,9 @@
             </ul>
         </li>
     {{/if}}
+    {{/unless}}
+
+
 
 {{/zone}}