Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-11 01:27:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

WW-4057 Updates validation section to reflect changes made in validators

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1480907 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Lukasz Lenart
2013-05-10 07:57:07 +00:00
parent 2580daa903
commit bcaa26597e
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/resources/template/xhtml/form-close-validate.ftl
+4 -5
View File
@@ -33,7 +33,7 @@ Only the following validators are supported:
* double validator
END SNIPPET: supported-validators
-->
<#if ((parameters.validate?default(false) == true) && (parameters.performValidation?default(false) == true))>
<#if ((parameters.validate!false == true) && (parameters.performValidation!false == true))>
<script type="text/javascript">
function validateForm_${parameters.id?replace('[^a-zA-Z0-9_]', '_', 'r')}() {
form = document.getElementById("${parameters.id}");
@@ -79,13 +79,13 @@ END SNIPPET: supported-validators
}
}
<#elseif validator.validatorType = "regex">
if (continueValidation && field.value != null && !field.value.match("${validator.expression?js_string}")) {
if (continueValidation && field.value != null && !field.value.match("${validator.regex?js_string}")) {
addError(field, error);
errors = true;
<#if validator.shortCircuit>continueValidation = false;</#if>
}
<#elseif validator.validatorType = "email">
if (continueValidation && field.value != null && field.value.length > 0 && field.value.match("${validator.expression?js_string}")==null) {
if (continueValidation && field.value != null && field.value.length > 0 && field.value.match("${validator.regex?js_string}")==null) {
addError(field, error);
errors = true;
<#if validator.shortCircuit>continueValidation = false;</#if>
@@ -96,7 +96,7 @@ END SNIPPET: supported-validators
errors = true;
<#if validator.shortCircuit>continueValidation = false;</#if>
}
<#elseif validator.validatorType = "int">
<#elseif validator.validatorType = "int" || validator.validatorType = "short">
if (continueValidation && field.value != null) {
if (<#if validator.min??>parseInt(field.value) <
${validator.min?c}<#else>false</#if> ||
@@ -116,7 +116,6 @@ END SNIPPET: supported-validators
<#if validator.maxExclusive??>value >= ${validator.maxExclusive?c}<#else>false</#if>) {
addError(field, error);
errors = true;
<#if validator.shortCircuit>continueValidation = false;</#if>
}
}
</#if>