From 4fe1cd8ccba16d3011eb4150d02eb09f366498e9 Mon Sep 17 00:00:00 2001 From: Imesh Chandrasiri Date: Wed, 26 Jul 2017 15:05:16 +0530 Subject: [PATCH 1/2] Fixing device type log not showing issue --- .../device-view.hbs | 18 +++++++++++++++++- .../public/js/device-view.js | 1 - 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.default.device.type.device-view/device-view.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.default.device.type.device-view/device-view.hbs index d4491a3f33..a3f87bfb29 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.default.device.type.device-view/device-view.hbs +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.default.device.type.device-view/device-view.hbs @@ -92,7 +92,23 @@
- Not available yet + + + + + + + + + + + + +
NamePositionOffice

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.view/public/js/device-view.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.view/public/js/device-view.js index fbc0d75486..e57001fe29 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.view/public/js/device-view.js +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.view/public/js/device-view.js @@ -73,7 +73,6 @@ function loadOperationsLog(update) { }, dataSrc: function(json) { $("#operations-spinner").addClass("hidden"); - $("#operations-log-container").empty(); return json.data; } }, From 9ce1baa920740a58a462bd8d050a1ffea61cfaef Mon Sep 17 00:00:00 2001 From: Imesh Chandrasiri Date: Wed, 26 Jul 2017 17:31:45 +0530 Subject: [PATCH 2/2] change CONFIG keyword to PROFILE --- .../cdmf.unit.default.device.operation-bar/operation-bar.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.default.device.operation-bar/operation-bar.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.default.device.operation-bar/operation-bar.hbs index a5a2b988e3..d2cfa74b71 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.default.device.operation-bar/operation-bar.hbs +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.default.device.operation-bar/operation-bar.hbs @@ -60,7 +60,7 @@