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-2103 Invalid Javascript generated for StringLength validator

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/branches/STRUTS_2_0_X@566209 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
James Holmes
2007-08-15 14:55:54 +00:00
parent 6a2daa73cf
commit 53d1d54536
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/resources/template/xhtml/form-close-validate.ftl
+8 -10
View File
@@ -68,10 +68,8 @@ END SNIPPET: supported-validators
while (value.substring(value.length-1, value.length) == ' ')
value = value.substring(0, value.length-1);
</#if>
if(value.length > 0 && (
(${validator.minLength} > -1 && value.length < ${validator.minLength}) ||
(${validator.maxLength} > -1 && value.length > ${validator.maxLength})
)) {
if ((${validator.minLength?string} > -1 && value.length < ${validator.minLength?string}) ||
(${validator.maxLength?string} > -1 && value.length > ${validator.maxLength?string})) {
addError(field, error);
errors = true;
}
@@ -94,9 +92,9 @@ END SNIPPET: supported-validators
<#elseif validator.validatorType = "int">
if (field.value != null) {
if (<#if validator.min?exists>parseInt(field.value) <
${validator.min}<#else>false</#if> ||
${validator.min?string}<#else>false</#if> ||
<#if validator.max?exists>parseInt(field.value) >
${validator.max}<#else>false</#if>) {
${validator.max?string}<#else>false</#if>) {
addError(field, error);
errors = true;
}
@@ -104,10 +102,10 @@ END SNIPPET: supported-validators
<#elseif validator.validatorType = "double">
if (field.value != null) {
var value = parseFloat(field.value);
if (<#if validator.minInclusive?exists>value < ${validator.minInclusive}<#else>false</#if> ||
<#if validator.maxInclusive?exists>value > ${validator.maxInclusive}<#else>false</#if> ||
<#if validator.minExclusive?exists>value <= ${validator.minExclusive}<#else>false</#if> ||
<#if validator.maxExclusive?exists>value >= ${validator.maxExclusive}<#else>false</#if>) {
if (<#if validator.minInclusive?exists>value < ${validator.minInclusive?string}<#else>false</#if> ||
<#if validator.maxInclusive?exists>value > ${validator.maxInclusive?string}<#else>false</#if> ||
<#if validator.minExclusive?exists>value <= ${validator.minExclusive?string}<#else>false</#if> ||
<#if validator.maxExclusive?exists>value >= ${validator.maxExclusive?string}<#else>false</#if>) {
addError(field, error);
errors = true;
}