From 6f5d6abea3cff13a8904b2f2670209aeadd90980 Mon Sep 17 00:00:00 2001 From: ayyoob Date: Thu, 11 Aug 2016 23:41:52 +0530 Subject: [PATCH] updated device type label to defaul device type name --- .../units/cdmf.unit.platform.configuration/configuration.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.platform.configuration/configuration.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.platform.configuration/configuration.js index 87105e0686f..bdf84142ac3 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.platform.configuration/configuration.js +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.platform.configuration/configuration.js @@ -30,9 +30,13 @@ function onRequest(context) { var configUnitName = utility.getTenantedDeviceUnitName(deviceTypeName, "platform.configuration"); if (configUnitName) { var deviceTypeConfig = utility.getDeviceTypeConfig(deviceTypeName); + var deviceTypeLabel = deviceTypeName; + if (deviceTypeConfig) { + deviceTypeLabel = deviceTypeConfig.deviceType.label; + } deviceTypesArray.push({ name: deviceTypeName, - label: deviceTypeConfig.deviceType.label, + label: deviceTypeLabel, unitName: configUnitName }); }