xlawrence 2006/01/02 15:52:28 CET
Modified files:
core/src/java/org/jahia/engines/validation
EngineValidationHelper.java
Log:
use indexOf instead of equals for the cases were depends has more than 1
value:
<field property="titreLong" depends="required, maxlength">
Revision Changes Path
1.8 +1 -1
jahia/core/src/java/org/jahia/engines/validation/EngineValidationHelper.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/engines/validation/EngineValidationHelper.java.diff?r1=1.7&r2=1.8&f=h
Index: EngineValidationHelper.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/engines/validation/EngineValidationHelper.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- EngineValidationHelper.java 2 Jan 2006 14:29:59 -0000 1.7
+++ EngineValidationHelper.java 2 Jan 2006 14:52:27 -0000 1.8
@@ -148,7 +148,7 @@
if (form == null) return false;
final Field f = form.getField(fieldName);
if (f == null) return false;
- return f.getDepends().equals("required") &&
fieldName.equals(f.getKey());
+ return f.getDepends().indexOf("required") > -1 &&
fieldName.equals(f.getKey());
}
return false;
}