From 86029752f8d5a1e6394a217aad86de2088f3927c Mon Sep 17 00:00:00 2001 From: charitha Date: Mon, 29 Oct 2018 21:03:24 +0530 Subject: [PATCH] Fixed https://github.com/wso2/product-iots/issues/1184 --- .../app/units/cdmf.unit.geo-dashboard/public/js/app.js | 6 ++++-- .../jaggeryapps/uuf-template-app/lib/error-pages-router.js | 3 +-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/app.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/app.js index 805ec7a3ab4..67b20c2a981 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/app.js +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/js/app.js @@ -279,10 +279,12 @@ var getProviderData = function (timeFrom, timeTo) { var serviceUrl = '/api/device-mgt/v1.0/geo-services/stats/' + deviceType + '/' + deviceId + '?from=' + timeFrom + '&to=' + timeTo; invokerUtil.get(serviceUrl, function (data) { - if(data === ""){showCurrentLocation(tableData);} + if (data === "") { + showCurrentLocation(tableData); + } tableData = JSON.parse(data); if (tableData.length === 0) { - showCurrentLocation(tableData); + showCurrentLocation(tableData); } }, function (message) { showCurrentLocation(tableData); diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/lib/error-pages-router.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/lib/error-pages-router.js index 5da3b447515..a0e30cc5476 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/lib/error-pages-router.js +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/lib/error-pages-router.js @@ -113,8 +113,7 @@ conf: appConfigurations }, uri: errorPage.definition[constants.PAGE_DEFINITION_URI], - uriParams: {}, - user: utils.getCurrentUser() + uriParams: {} }; var templateContext = {status: status, message: message}; var renderer = require("/lib/dynamic-files-renderer.js").renderer;