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

Merge pull request #389 from inoshperera/master

Browse Source 
fixing EMM-1788 calDAV policy validation issue
revert-dabc3590
Milan Perera 8 years ago committed by GitHub
parent 4fdc358786 b0ccf2d27d
commit d368cffa99
4 changed files with 35 additions and 45 deletions
Show Stats Download Patch File Download Diff File

37
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

@ -1843,28 +1843,23 @@ validateStep["policy-profile"] = function () {
if (continueToCheckNextInputs) {
var calendarAccountPort = $("input#calendar-account-port").val();
if (!calendarAccountPort) {
validationStatus = {
"error": true,
"subErrorMsg": "Account Port is empty. You cannot proceed.",
"erroneousFeature": operation
};
continueToCheckNextInputs = false;
} else if (!$.isNumeric(calendarAccountPort)) {
validationStatus = {
"error": true,
"subErrorMsg": "Account Port requires a number input.",
"erroneousFeature": operation
};
continueToCheckNextInputs = false;
} else if (!inputIsValidAgainstRange(calendarAccountPort, 0, 65535)) {
validationStatus = {
"error": true,
"subErrorMsg": "Account Port is not within the range " +
if (calendarAccountPort) {
if (!$.isNumeric(calendarAccountPort)) {
validationStatus = {
"error": true,
"subErrorMsg": "Account Port requires a number input.",
"erroneousFeature": operation
};
continueToCheckNextInputs = false;
} else if (!inputIsValidAgainstRange(calendarAccountPort, 0, 65535)) {
validationStatus = {
"error": true,
"subErrorMsg": "Account Port is not within the range " +
"of valid port numbers.",
"erroneousFeature": operation
};
continueToCheckNextInputs = false;
"erroneousFeature": operation
};
continueToCheckNextInputs = false;
}
}
}

2
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-ios.hbs
Unescape View File

@ -3236,7 +3236,7 @@
</label>
<input id="calendar-account-port" type="text" class="form-control operationDataKeys"
data-key="calendarAccountPort" maxlength="5" data-default=""
placeholder="[ Required field which requires Number Input ]"/>
placeholder="[ Optional field which requires Number Input ]"/>
</div>
<div class="wr-input-control">

39
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

@ -1601,28 +1601,23 @@ validateStep["policy-profile"] = function () {
if (continueToCheckNextInputs) {
var calendarAccountPort = $("input#calendar-account-port").val();
if (!calendarAccountPort) {
validationStatus = {
"error": true,
"subErrorMsg": "Account Port is empty. You cannot proceed.",
"erroneousFeature": operation
};
continueToCheckNextInputs = false;
} else if (!$.isNumeric(calendarAccountPort)) {
validationStatus = {
"error": true,
"subErrorMsg": "Account Port requires a number input.",
"erroneousFeature": operation
};
continueToCheckNextInputs = false;
} else if (!inputIsValidAgainstRange(calendarAccountPort, 0, 65535)) {
validationStatus = {
"error": true,
"subErrorMsg": "Account Port is not within the range " +
"of valid port numbers.",
"erroneousFeature": operation
};
continueToCheckNextInputs = false;
if (calendarAccountPort) {
if (!$.isNumeric(calendarAccountPort)) {
validationStatus = {
"error": true,
"subErrorMsg": "Account Port requires a number input.",
"erroneousFeature": operation
};
continueToCheckNextInputs = false;
} else if (!inputIsValidAgainstRange(calendarAccountPort, 0, 65535)) {
validationStatus = {
"error": true,
"subErrorMsg": "Account Port is not within the range " +
"of valid port numbers.",
"erroneousFeature": operation
};
continueToCheckNextInputs = false;
}
}
}

2
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-ios-edit.hbs
Unescape View File

@ -3339,7 +3339,7 @@
</label>
<input id="calendar-account-port" type="text" class="form-control operationDataKeys"
data-key="calendarAccountPort" maxlength="5" data-default=""
placeholder="[ Required field which requires Number Input ]"/>
placeholder="[ Optional field which requires Number Input ]"/>
</div>
<div class="wr-input-control">

Write Preview
Loading…
Cancel
Save