community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix platform configuration display for custom units

Browse Source
This commit is contained in:
charitha 2020-03-25 19:24:43 +05:30
parent 03345edca3
commit f1aa82c2b8
4 changed files with 64 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.platform.configuration/configuration.hbs
View File

@ -16,10 +16,6 @@
under the License.
}}
{{#zone "topCss"}}
{{css "css/platform-configuration.css"}}
{{/zone}}
{{#zone "content"}}
{{#if isAuthorized}}
<div class="row">
@ -32,21 +28,15 @@
Platform Configurations
</h1>
<br>
{{#if isCloud}}
iOS Mobile Management Specific Server Settings for the Tenant
{{else}}
General and Platform Specific Server Settings for the Tenant
{{/if}}
<br>
<br>
<div class="wr-advance-operations">
<div class="row">
<div class="wr-hidden-operations-nav col-lg-4">
{{#unless isCloud}}
<a id="generalConfigLink" href="javascript:void(0)" onclick="showAdvanceOperation('general', this)" class="selected">
<a id="generalConfigLink" href="javascript:void(0)"
onclick="showAdvanceOperation('general', this)" class="selected">
<span class="wr-hidden-operations-icon fw-stack">
<i class="fw fw-settings fw-stack-2x"></i>
<span class="fw-stack fw-move-right fw-move-bottom">
@ -57,12 +47,9 @@
</span>
General Configurations
</a>
{{/unless}}
{{#each deviceTypes}}
<a id="{{name}}ConfigLink" href="javascript:void(0)" onclick="showAdvanceOperation('{{name}}', this)"
{{#if isCloud}}
class="selected"
{{/if}} >
<a id="{{name}}ConfigLink" href="javascript:void(0)"
onclick="showAdvanceOperation('{{name}}', this)">
<span class="wr-hidden-operations-icon fw-stack">
<i class="fw fw-settings fw-stack-2x"></i>
<span class="fw-stack fw-move-right fw-move-bottom">
@ -82,7 +69,6 @@
<div class="wr-hidden-operations-content col-lg-8">
<!-- general -->
{{#unless isCloud}}
<div class="wr-hidden-operation" data-operation="general" style="display: block">
<div class="panel panel-default">
<div id="general-config-heading" class="panel-heading" role="tab">
@ -129,7 +115,6 @@
{{/if}}
</div>
</div>
{{/unless}}
<!-- general-->
{{#each deviceTypes}}
<div class="wr-hidden-operation" data-operation="{{name}}" style="display: none;">
@ -140,7 +125,6 @@
{{/if}}
</div>
{{/each}}
</div>
</div>
</div>
@ -155,7 +139,9 @@
<b>"Exit"</b> to complete the process and go back to the dashboard.
<hr/>
<button class="wr-btn"
onclick="window.location.href='{{@app.context}}/platform-configuration'">Go back to configurations</button>
onclick="window.location.href='{{@app.context}}/platform-configuration'">Go back to
configurations
</button>
<button class="wr-btn" onclick="window.location.href='{{@app.context}}'">Exit</button>
</div>
</div>

3
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.platform.configuration/configuration.js
View File

@ -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);

1
features/org.wso2.carbon.device.application.mgt.store.ui.feature/src/main/resources/build.properties
View File

@ -1 +0,0 @@
custom = true

4
features/org.wso2.carbon.device.application.mgt.store.ui.feature/src/main/resources/p2.inf
View File

@ -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);\