Merge pull request #239 from charithag/master

Fixed https://wso2.org/jira/browse/IOTS-104

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/utility.js

@@ -80,18 +80,13 @@ utility = function () {
     };
 
     publicMethods.getDeviceTypeConfig = function (deviceType) {
-        var JFile = Packages.java.io.File;
-        var sep = JFile.separator;
-
-        var systemProcess = require('process');
-        var parent = 'file:///' + (systemProcess.getProperty('jaggery.home') || systemProcess.getProperty('carbon.home')).replace(/[\\]/g, '/').replace(/^[\/]/g, '');
+        var unitName = publicMethods.getTenantedDeviceUnitName(deviceType, "type-view");
         
         if (deviceType in deviceTypeConfigMap) {
             return deviceTypeConfigMap[deviceType];
         }
         var deviceTypeConfig;
-        var deviceTypeConfigFile = new File(parent + sep + "repository" + sep + "conf" + sep
-                                            + "device-types" + sep + deviceType + ".json");
+        var deviceTypeConfigFile = new File("/app/units/" + unitName + "/private/config.json");
         if (deviceTypeConfigFile.isExists()) {
             try {
                 deviceTypeConfigFile.open("r");

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.js

@@ -54,7 +54,11 @@ function onRequest(context) {
             var deviceTypes = [];
             if (data) {
                 for (var i = 0; i < data.length; i++) {
-                    var deviceType = utility.getDeviceTypeConfig(data[i].name).deviceType;
+                    var config = utility.getDeviceTypeConfig(data[i].name);
+                    if (!config){
+                        continue;
+                    }
+                    var deviceType = config.deviceType;
                     deviceTypes.push({
                         "type": data[i].name,
                         "category": deviceType.category,