svn commit: r1337135 - /ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/CheckId.java

[adrianc]

Author: adrianc
Date: Fri May 11 12:55:55 2012
New Revision: 1337135

URL: http://svn.apache.org/viewvc?rev=1337135&view=rev
Log:
Fixed Mini-language validation for the <check-id> element.

Modified:
    ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/CheckId.java

Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/CheckId.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/CheckId.java?rev=1337135&r1=1337134&r2=1337135&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/CheckId.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/CheckId.java Fri May 11 12:55:55 2012
@@ -50,10 +50,10 @@ public final class CheckId extends Metho
     public CheckId(Element element, SimpleMethod simpleMethod) throws MiniLangException {
         super(element, simpleMethod);
         if (MiniLangValidate.validationOn()) {
-            MiniLangValidate.attributeNames(simpleMethod, element, "error-list-name");
+            MiniLangValidate.attributeNames(simpleMethod, element, "field", "error-list-name");
             MiniLangValidate.constantAttributes(simpleMethod, element, "error-list-name");
+            MiniLangValidate.expressionAttributes(simpleMethod, element, "field");
             MiniLangValidate.childElements(simpleMethod, element, "fail-message", "fail-property");
-            MiniLangValidate.requireAnyChildElement(simpleMethod, element, "fail-message", "fail-property");
         }
         this.errorListFma = FlexibleMapAccessor.getInstance(MiniLangValidate.checkAttribute(element.getAttribute("error-list-name"), "error_list"));
         this.fieldFma = FlexibleMapAccessor.getInstance(element.getAttribute("field"));