From 5ff3ba3fcc030bed0f5dd0d216f739566b60d47e Mon Sep 17 00:00:00 2001
From: charitha <charitha.ws@gmail.com>
Date: Tue, 21 Mar 2017 11:14:27 +0530
Subject: [PATCH 1/2] Fix issue in showing dynamic icons

---
 .../modules/business-controllers/operation.js    | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/operation.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/operation.js
index e9c07ee0ba..dd200cdfbe 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/operation.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/operation.js
@@ -81,21 +81,11 @@ var operationModule = function () {
 
     publicMethods.getControlOperations = function (deviceType) {
         var operations = privateMethods.getOperationsFromFeatures(deviceType, "operation");
-        var features = utility.getDeviceTypeConfig(deviceType).deviceType.features;
         for (var op in operations) {
             var iconIdentifier = operations[op].operation;
-            if (features && features[iconIdentifier]) {
-                var icon = features[iconIdentifier].icon;
-                if (icon) {
-                    operations[op]["iconFont"] = icon;
-                } else if (iconPath) {
-                    var iconPath = utility.getOperationIcon(deviceType, iconIdentifier);
-                    operations[op]["icon"] = iconPath;
-                }
-                var formParams = features[iconIdentifier].formParams;
-                if (formParams) {
-                    operations[op]["uiParams"] = formParams;
-                }
+            var icon = utility.getOperationIcon(deviceType, iconIdentifier);
+            if (icon) {
+                operations[op]["icon"] = icon;
             }
         }
         return operations;

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

---
 .../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 d40bb52ada..b51e7f0eb8 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 1e1cefcb83..9b0cdacddb 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,