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 @@
-
- our {{deviceTypeLabel}} device
+ our {{deviceTypeLabel}} device
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,