Merge branch 'master' of https://github.com/wso2/carbon-device-mgt

8 years ago · 39519800ab
parent 9b6973226c 87a03e8312
commit 39519800ab
1 changed files with 4 additions and 1 deletions
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/device.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/device.js
@ -97,7 +97,10 @@ deviceModule = function () {
                            properties[constants["DEVICE_VENDOR"]] = constants["VENDOR_APPLE"];
                        }
                        deviceObject[constants["DEVICE_PROPERTIES"]] = properties;
+                        if (device["deviceInfo"]) {
                            deviceObject[constants["DEVICE_INFO"]] = device["deviceInfo"];
+                        }
+
                        response["content"] = deviceObject;
                        return response;
                    } else if (backendResponse.status == 401) {