Author: bpapez
Date: Wed Jun 6 17:48:27 2007
New Revision: 17490
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17490&repname=
=3Djahia
Log:
* fix for isFieldMandatory to check for alias names
* no need to put (mandatory) in the field definition as the (*) is now auto=
matically added
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/validation=
/EngineValidationHelper.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/vali=
dation/EngineValidationHelper.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/engines/validation/EngineValidationHelper.j=
ava&rev=3D17490&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/validation=
/EngineValidationHelper.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/validation=
/EngineValidationHelper.java Wed Jun 6 17:48:27 2007
@@ -124,9 +124,16 @@
final Form form =3D vr.getForm(jParams.getLocale(), validatorK=
ey);
logger.debug("Form: " + form);
if (form =3D=3D null) return false;
- final Field f =3D form.getField(fieldName);
+ Field f =3D form.getField(fieldName);
+ if (f =3D=3D null) {
+ String[] aliasNames =3D theField.getDefinition().getAliasN=
ame();
+ for (int i =3D 0; f =3D=3D null && i < aliasNames.length; =
i++) {
+ String aliasName =3D aliasNames[i];
+ f =3D form.getField(aliasName);
+ } =
+ }
if (f =3D=3D null) return false;
- return f.getDepends().indexOf("required") > -1 && fieldName.eq=
uals(f.getKey());
+ return f.getDepends().indexOf("required") > -1;
}
return false;
}
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
