Add capability to store device type specific platform configurations for any device type

revert-dabc3590
Charitha Goonetilleke 6 years ago
parent e6d4ff931e
commit 986c9461ac

@ -21,6 +21,7 @@ package org.wso2.carbon.mdm.services.android.mocks;
import org.wso2.carbon.device.mgt.common.Device; import org.wso2.carbon.device.mgt.common.Device;
import org.wso2.carbon.device.mgt.common.DeviceIdentifier; import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
import org.wso2.carbon.device.mgt.common.DeviceManagementException; import org.wso2.carbon.device.mgt.common.DeviceManagementException;
import org.wso2.carbon.device.mgt.common.DeviceTypeNotFoundException;
import org.wso2.carbon.device.mgt.common.EnrolmentInfo; import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
import org.wso2.carbon.device.mgt.common.FeatureManager; import org.wso2.carbon.device.mgt.common.FeatureManager;
import org.wso2.carbon.device.mgt.common.InvalidDeviceException; import org.wso2.carbon.device.mgt.common.InvalidDeviceException;
@ -289,7 +290,7 @@ public class DeviceManagementProviderServiceMock implements DeviceManagementProv
} }
@Override @Override
public FeatureManager getFeatureManager(String s) throws DeviceManagementException { public FeatureManager getFeatureManager(String s) throws DeviceTypeNotFoundException {
return null; return null;
} }

@ -17,6 +17,11 @@
}} }}
<!-- android --> <!-- android -->
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading" role="tab">
<h2 class="sub-title panel-title">
Platform Configuration - Windows
</h2>
</div>
<div id="android-config-body" class="panel-collapse panel-body" role="tabpanel"> <div id="android-config-body" class="panel-collapse panel-body" role="tabpanel">
<div id="android-config-error-msg" class="alert alert-danger hidden" role="alert"> <div id="android-config-error-msg" class="alert alert-danger hidden" role="alert">
<i class="icon fw fw-error"></i><span></span> <i class="icon fw fw-error"></i><span></span>

@ -92,7 +92,7 @@ var kioskConfigs = {
$(document).ready(function () { $(document).ready(function () {
$("#fcm-inputs").hide(); $("#fcm-inputs").hide();
tinymce.init({ tinymce.init({
selector: "textarea", selector: "#android-eula",
height:500, height:500,
theme: "modern", theme: "modern",
plugins: [ plugins: [

@ -21,6 +21,7 @@ package org.wso2.carbon.mdm.services.android.mocks;
import org.wso2.carbon.device.mgt.common.Device; import org.wso2.carbon.device.mgt.common.Device;
import org.wso2.carbon.device.mgt.common.DeviceIdentifier; import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
import org.wso2.carbon.device.mgt.common.DeviceManagementException; import org.wso2.carbon.device.mgt.common.DeviceManagementException;
import org.wso2.carbon.device.mgt.common.DeviceTypeNotFoundException;
import org.wso2.carbon.device.mgt.common.EnrolmentInfo; import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
import org.wso2.carbon.device.mgt.common.FeatureManager; import org.wso2.carbon.device.mgt.common.FeatureManager;
import org.wso2.carbon.device.mgt.common.InvalidDeviceException; import org.wso2.carbon.device.mgt.common.InvalidDeviceException;
@ -289,7 +290,7 @@ public class DeviceManagementProviderServiceMock implements DeviceManagementProv
} }
@Override @Override
public FeatureManager getFeatureManager(String s) throws DeviceManagementException { public FeatureManager getFeatureManager(String s) throws DeviceTypeNotFoundException {
return null; return null;
} }

@ -17,6 +17,11 @@
}} }}
<!-- windows --> <!-- windows -->
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading" role="tab">
<h2 class="sub-title panel-title">
Platform Configuration - Windows
</h2>
</div>
<div id="windows-config-body" class="panel-collapse panel-body" role="tabpanel"> <div id="windows-config-body" class="panel-collapse panel-body" role="tabpanel">
<div id="windows-config-error-msg" class="alert alert-danger hidden" role="alert"> <div id="windows-config-error-msg" class="alert alert-danger hidden" role="alert">
<i class="icon fw fw-error"></i><span></span> <i class="icon fw fw-error"></i><span></span>

@ -72,7 +72,7 @@ function promptErrorPolicyPlatform(errorMsg) {
$(document).ready(function () { $(document).ready(function () {
tinymce.init({ tinymce.init({
selector: "textarea", selector: "#windows-eula",
height:500, height:500,
theme: "modern", theme: "modern",
plugins: [ plugins: [

@ -1230,7 +1230,7 @@
<javax.ws.rs.version>1.1.1</javax.ws.rs.version> <javax.ws.rs.version>1.1.1</javax.ws.rs.version>
<!-- Carbon Device Management --> <!-- Carbon Device Management -->
<carbon.devicemgt.version>3.2.4</carbon.devicemgt.version> <carbon.devicemgt.version>3.2.5-SNAPSHOT</carbon.devicemgt.version>
<carbon.devicemgt.version.range>[3.1.0, 4.0.0)</carbon.devicemgt.version.range> <carbon.devicemgt.version.range>[3.1.0, 4.0.0)</carbon.devicemgt.version.range>
<!-- Carbon App Management --> <!-- Carbon App Management -->

Loading…
Cancel
Save