inosh
/
device-mgt-plugins
forked from community/device-mgt-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
revert-dabc3590
Megala 8 years ago
parent 1aae9701d1 67d660ef1f
commit 723e1dead2
7 changed files with 86 additions and 96 deletions
Show Stats Download Patch File Download Diff File

4
components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-mod/public/js/operation-mod.js
Unescape View File

@ -298,7 +298,7 @@ var operationModule = function () {
case iosOperationConstants["WIFI_OPERATION_CODE"]:
payload = {
"wifiHiddenNetwork": operationPayload["hiddenNetwork"],
"wifiSSID": operationPayload["ssid"],
"wifiSSID": operationPayload["SSID"],
"wifiAutoJoin": operationPayload["autoJoin"],
"wifiProxyType": operationPayload["proxyType"],
"wifiEncryptionType": operationPayload["encryptionType"],
@ -441,7 +441,7 @@ var operationModule = function () {
operationType = operationTypeConstants["PROFILE"];
payload = {
"operation": {
"ssid": operationData["wifiSSID"],
"SSID": operationData["wifiSSID"],
"hiddenNetwork": operationData["wifiHiddenNetwork"],
"autoJoin": operationData["wifiAutoJoin"],
"proxyType": operationData["wifiProxyType"],

29
components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/js/policy-create.js
Unescape View File

@ -535,16 +535,13 @@ validateStep["policy-profile"] = function () {
// Updating validationStatusArray with validationStatus
validationStatusArray.push(validationStatus);
}
if ($.inArray(androidOperationConstants["KIOSK_APPS_CODE"], configuredOperations) != -1) {
//If COSU whitelisting applications configured
operation = androidOperationConstants["KIOSK_APPS"];
// Initializing continueToCheckNextInputs to true
continueToCheckNextInputs = true;
var whitelistedApplicationsGridChildInputs = "div#cosu-whitelisted-applications .child-input";
if (continueToCheckNextInputs) {
if ($(whitelistedApplicationsGridChildInputs).length == 0) {
validationStatus = {
@ -609,20 +606,16 @@ validateStep["policy-profile"] = function () {
};
continueToCheckNextInputs = false;
}
}
}
if (continueToCheckNextInputs) {
validationStatus = {
"error": false,
"okFeature": operation
};
}
// Updating validationStatusArray with validationStatus
validationStatusArray.push(validationStatus);
}
}
}
@ -2550,14 +2543,12 @@ var slideDownPaneAgainstValueSet = function (selectElement, paneID, valueSet) {
var slideDownPaneAgainstValueSetForRadioButtons = function (selectElement, paneID, valueSet) {
var selectedValueOnChange = selectElement.value;
var i, slideDownVotes = 0;
for (i = 0; i < valueSet.length; i++) {
if (selectedValueOnChange == valueSet[i]) {
slideDownVotes++;
}
}
var paneSelector = "#" + paneID;
if(slideDownVotes > 0) {
$(paneSelector).removeClass("hidden");
@ -2799,6 +2790,26 @@ $(document).ready(function () {
}
});
// <start - fixing feature-configuring switch double-click issue>
$(advanceOperations).on('hidden.bs.collapse', function (event) {
var collapsedFeatureBody = event.target.id;
var featureConfiguringSwitch = "#" + collapsedFeatureBody.
substr(0, collapsedFeatureBody.lastIndexOf("-")) + "-heading input[type=checkbox]";
if ($(featureConfiguringSwitch).prop("checked") == true) {
$(featureConfiguringSwitch).prop("checked", false);
}
});
$(advanceOperations).on('shown.bs.collapse', function (event) {
var expandedFeatureBody = event.target.id;
var featureConfiguringSwitch = "#" + expandedFeatureBody.
substr(0, expandedFeatureBody.lastIndexOf("-")) + "-heading input[type=checkbox]";
if ($(featureConfiguringSwitch).prop("checked") == false) {
$(featureConfiguringSwitch).prop("checked", true);
}
});
// <end - fixing feature-configuring switch double-click issue>
// adding support for cloning multiple profiles per feature with cloneable class definitions
$(advanceOperations).on("click", ".multi-view.add.enabled", function () {
// get a copy of .cloneable and create new .cloned div element

5
components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/templates/hidden-operations-android.hbs
Unescape View File

@ -1201,14 +1201,12 @@
to modify these settings on their devices.
</div>
</div>
<div id="cosu-system-update-policy-body hidden" class="panel-collapse panel-body collapse" role="tabpanel"
aria-labelledby="cosu-system-update-policy-body">
<hr/>
<div id="cosu-system-update-policy-feature-error-msg" class="alert alert-danger hidden" role="alert">
<i class="icon fw fw-error"></i><span></span>
</div>
<div class="wr-input-control">
<label class="wr-input-label">
System Update
@ -1242,7 +1240,6 @@
</span>
</label>
</div>
<div id="cosu-system-update-policy-window-select" class="hidden">
<div>
<ul class="message message-info">
@ -1326,7 +1323,6 @@
</select>
</div>
</div>
</div>
</div>
</div>
@ -1352,7 +1348,6 @@
to modify these settings on their devices.
</div>
</div>
<div id="cosu-whitelisted-applications-body" class="panel-collapse panel-body collapse" role="tabpanel"
aria-labelledby="cosu-whitelisted-applications-body">
<hr/>

30
components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/js/edit.js
Unescape View File

@ -515,9 +515,7 @@ validateStep["policy-profile"] = function () {
operation = androidOperationConstants["KIOSK_APPS"];
// Initializing continueToCheckNextInputs to true
continueToCheckNextInputs = true;
var whitelistedApplicationsGridChildInputs = "div#cosu-whitelisted-applications .child-input";
if (continueToCheckNextInputs) {
if ($(whitelistedApplicationsGridChildInputs).length == 0) {
validationStatus = {
@ -582,20 +580,16 @@ validateStep["policy-profile"] = function () {
};
continueToCheckNextInputs = false;
}
}
}
if (continueToCheckNextInputs) {
validationStatus = {
"error": false,
"okFeature": operation
};
}
// Updating validationStatusArray with validationStatus
validationStatusArray.push(validationStatus);
}
}
} if (policy["platform"] == platformTypeConstants["WINDOWS"]) {
@ -2559,21 +2553,25 @@ $(document).ready(function () {
}
});
$(advanceOperations).on('hidden.bs.collapse', function () {
if($(this).find('input').prop('checked')){
$(this).find('input').prop('checked',false);
// <start - fixing feature-configuring switch double-click issue>
$(advanceOperations).on('hidden.bs.collapse', function (event) {
var collapsedFeatureBody = event.target.id;
var featureConfiguringSwitch = "#" + collapsedFeatureBody.
substr(0, collapsedFeatureBody.lastIndexOf("-")) + "-heading input[type=checkbox]";
if ($(featureConfiguringSwitch).prop("checked") == true) {
$(featureConfiguringSwitch).prop("checked", false);
}
});
$(advanceOperations).on('shown.bs.collapse', function () {
if($(this).find('input').prop('checked') == false){
$(this).find('input').prop('checked',true);
$(advanceOperations).on('shown.bs.collapse', function (event) {
var expandedFeatureBody = event.target.id;
var featureConfiguringSwitch = "#" + expandedFeatureBody.
substr(0, expandedFeatureBody.lastIndexOf("-")) + "-heading input[type=checkbox]";
if ($(featureConfiguringSwitch).prop("checked") == false) {
$(featureConfiguringSwitch).prop("checked", true);
}
});
// <end - fixing feature-configuring switch double-click issue>
// adding support for cloning multiple profiles per feature with cloneable class definitions
$(advanceOperations).on("click", ".multi-view.add.enabled", function () {

5
components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/templates/hidden-operations-android-edit.hbs
Unescape View File

@ -1334,14 +1334,12 @@
</div>
</h2>
</div>
<div id="cosu-system-update-policy-body" class="panel-collapse panel-body collapse" role="tabpanel"
aria-labelledby="cosu-system-update-policy-body">
<div id="cosu-system-update-policy-feature-error-msg" class="alert alert-danger hidden" role="alert">
<i class="icon fw fw-error"></i><span></span>
</div>
<div class="wr-input-control">
<label class="wr-input-label">
System Update
@ -1375,7 +1373,6 @@
</span>
</label>
</div>
<div id="cosu-system-update-policy-window-select" class="hidden">
<div>
<ul class="message message-info">
@ -1486,14 +1483,12 @@
</div>
</h2>
</div>
<div id="cosu-whitelisted-applications-body" class="panel-collapse panel-body collapse" role="tabpanel"
aria-labelledby="cosu-whitelisted-applications-body">
<div id="cosu-whitelisted-applications-feature-error-msg" class="alert alert-danger hidden" role="alert">
<i class="icon fw fw-error"></i><span></span>
</div>
<div class="wr-input-control">
<label class="wr-input-label" for="cosu-whitelisted-applications">
Whitelisted Applications to enter Lock Task Mode

2
components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.view/public/js/view.js
Unescape View File

@ -1954,14 +1954,12 @@ var slideDownPaneAgainstValueSet = function (selectElement, paneID, valueSet) {
var slideDownPaneAgainstValueSetForRadioButtons = function (selectElement, paneID, valueSet) {
var selectedValueOnChange = selectElement.value;
var i, slideDownVotes = 0;
for (i = 0; i < valueSet.length; i++) {
if (selectedValueOnChange == valueSet[i]) {
slideDownVotes++;
}
}
var paneSelector = "#" + paneID;
if(slideDownVotes > 0) {
$(paneSelector).removeClass("hidden");

7
components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.view/public/templates/hidden-operations-android-view.hbs
Unescape View File

@ -1260,14 +1260,11 @@
</div>
</h2>
</div>
<div id="cosu-system-update-policy-body" class="panel-collapse panel-body collapse" role="tabpanel"
aria-labelledby="cosu-system-update-policy-body">
<div id="cosu-system-update-policy-feature-error-msg" class="alert alert-danger hidden" role="alert">
<i class="icon fw fw-error"></i><span></span>
</div>
<div class="wr-input-control">
<label class="wr-input-label">
System Update
@ -1301,7 +1298,6 @@
</span>
</label>
</div>
<div id="cosu-system-update-policy-window-select" class="hidden">
<div>
<ul class="message message-info">
@ -1385,7 +1381,6 @@
</select>
</div>
</div>
</div>
</div>
</div>
@ -1412,14 +1407,12 @@
</div>
</h2>
</div>
<div id="cosu-whitelisted-applications-body" class="panel-collapse panel-body collapse" role="tabpanel"
aria-labelledby="cosu-whitelisted-applications-body">
<div id="cosu-whitelisted-applications-feature-error-msg" class="alert alert-danger hidden" role="alert">
<i class="icon fw fw-error"></i><span></span>
</div>
<div class="wr-input-control">
<label class="wr-input-label" for="cosu-whitelisted-applications">
Whitelisted Applications to enter Lock Task Mode

Write Preview
Loading…
Cancel
Save