From f1aa82c2b8496cb38a8025e1c4acf8e0255f5c7c Mon Sep 17 00:00:00 2001 From: charitha Date: Wed, 25 Mar 2020 19:24:43 +0530 Subject: [PATCH] Fix platform configuration display for custom units --- .../configuration.hbs | 138 ++++++++---------- .../configuration.js | 3 +- .../src/main/resources/build.properties | 1 - .../src/main/resources/p2.inf | 4 - 4 files changed, 64 insertions(+), 82 deletions(-) delete mode 100644 features/org.wso2.carbon.device.application.mgt.store.ui.feature/src/main/resources/build.properties delete mode 100644 features/org.wso2.carbon.device.application.mgt.store.ui.feature/src/main/resources/p2.inf diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.platform.configuration/configuration.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.platform.configuration/configuration.hbs index 8e4131fa19..753a3c8851 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.platform.configuration/configuration.hbs +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.platform.configuration/configuration.hbs @@ -16,37 +16,27 @@ under the License. }} -{{#zone "topCss"}} - {{css "css/platform-configuration.css"}} -{{/zone}} - {{#zone "content"}} {{#if isAuthorized}} -
-
- -
-
+
+
+ +
+
-

- Platform Configurations -

-
- {{#if isCloud}} - iOS Mobile Management Specific Server Settings for the Tenant - {{else}} +

+ Platform Configurations +

+
General and Platform Specific Server Settings for the Tenant - {{/if}} - -
-
- -
-
-
+
+
- {{#unless isCloud}} - +
+
+ + {{label}} Configurations + + {{/each}} +
-
- - {{#unless isCloud}} +
+
{{#if geoServicesEnabled}} - -
-
- + +
+
+ +
-
{{/if}}
- {{/unless}} - - {{#each deviceTypes}} - - {{/each}} - + + {{#each deviceTypes}} + + {{/each}} +
-
- -
{{else}}

Permission Denied 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 4fc10b836f..16a1734c33 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 @@ -34,6 +34,7 @@ */ function onRequest(context) { + var log = new Log("configuration.js"); var utility = require("/app/modules/utility.js").utility; var deviceModule = require("/app/modules/business-controllers/device.js")["deviceModule"]; var devicemgtProps = require("/app/modules/conf-reader/main.js")["conf"]; @@ -50,7 +51,7 @@ function onRequest(context) { if (data) { for (var i = 0; i < data.length; i++) { var deviceTypeName = data[i].name; - var deviceTypeLabel = deviceTypeName.charAt(0).toUpperCase() + deviceTypeName.slice(1);; + var deviceTypeLabel = deviceTypeName.charAt(0).toUpperCase() + deviceTypeName.slice(1); var configUnitName = utility.getTenantedDeviceUnitName(deviceTypeName, "platform.configuration"); if (configUnitName) { var deviceTypeConfig = utility.getDeviceTypeConfig(deviceTypeName); diff --git a/features/org.wso2.carbon.device.application.mgt.store.ui.feature/src/main/resources/build.properties b/features/org.wso2.carbon.device.application.mgt.store.ui.feature/src/main/resources/build.properties deleted file mode 100644 index 9c86577d76..0000000000 --- a/features/org.wso2.carbon.device.application.mgt.store.ui.feature/src/main/resources/build.properties +++ /dev/null @@ -1 +0,0 @@ -custom = true diff --git a/features/org.wso2.carbon.device.application.mgt.store.ui.feature/src/main/resources/p2.inf b/features/org.wso2.carbon.device.application.mgt.store.ui.feature/src/main/resources/p2.inf deleted file mode 100644 index 7240587940..0000000000 --- a/features/org.wso2.carbon.device.application.mgt.store.ui.feature/src/main/resources/p2.inf +++ /dev/null @@ -1,4 +0,0 @@ -instructions.configure = \ -org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/webapps);\ -org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/webapps/publisher/);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.application.mgt.publisher.ui_${feature.version}/publisher/public/,target:${installFolder}/../../deployment/server/webapps/publisher/,overwrite:true);\