You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ad...@apache.org on 2012/05/22 13:13:26 UTC
svn commit: r1341408 -
/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FilterListByAnd.java
Author: adrianc
Date: Tue May 22 11:13:26 2012
New Revision: 1341408
URL: http://svn.apache.org/viewvc?rev=1341408&view=rev
Log:
Oops, forgot to add validation to the <filter-list-by-and> element.
Modified:
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FilterListByAnd.java
Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FilterListByAnd.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FilterListByAnd.java?rev=1341408&r1=1341407&r2=1341408&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FilterListByAnd.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FilterListByAnd.java Tue May 22 11:13:26 2012
@@ -26,6 +26,7 @@ import org.ofbiz.base.util.string.Flexib
import org.ofbiz.entity.GenericEntity;
import org.ofbiz.entity.util.EntityUtil;
import org.ofbiz.minilang.MiniLangException;
+import org.ofbiz.minilang.MiniLangValidate;
import org.ofbiz.minilang.SimpleMethod;
import org.ofbiz.minilang.method.MethodContext;
import org.ofbiz.minilang.method.MethodOperation;
@@ -42,6 +43,12 @@ public final class FilterListByAnd exten
public FilterListByAnd(Element element, SimpleMethod simpleMethod) throws MiniLangException {
super(element, simpleMethod);
+ if (MiniLangValidate.validationOn()) {
+ MiniLangValidate.attributeNames(simpleMethod, element, "list", "map", "to-list");
+ MiniLangValidate.requiredAttributes(simpleMethod, element, "list", "map");
+ MiniLangValidate.expressionAttributes(simpleMethod, element, "list", "map", "to-list");
+ MiniLangValidate.noChildElements(simpleMethod, element);
+ }
listFma = FlexibleMapAccessor.getInstance(element.getAttribute("list"));
String toListAttribute = element.getAttribute("to-list");
if (toListAttribute.isEmpty()) {