Re: svn commit: r735966 - in /ofbiz/trunk/framework/widget: dtd/widget-menu.xsd src/org/ofbiz/widget/menu/ModelMenuCondition.java

[Jacques Le Roux]

XSD updated on site in r735991.

Jacques

From: <[hidden email]>

> Author: jonesde
> Date: Tue Jan 20 00:40:48 2009
> New Revision: 735966
>
> URL: http://svn.apache.org/viewvc?rev=735966&view=rev
> Log:
> One last attribute cleanup that I missed before, thanks to Marco for noticing this
>
> Modified:
>    ofbiz/trunk/framework/widget/dtd/widget-menu.xsd
>    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuCondition.java
>
> Modified: ofbiz/trunk/framework/widget/dtd/widget-menu.xsd
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/dtd/widget-menu.xsd?rev=735966&r1=735965&r2=735966&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/widget/dtd/widget-menu.xsd (original)
> +++ ofbiz/trunk/framework/widget/dtd/widget-menu.xsd Tue Jan 20 00:40:48 2009
> @@ -569,6 +569,6 @@
>         </xs:complexType>
>     </xs:element>
>     <xs:attributeGroup name="attlist.if-empty">
> -        <xs:attribute name="field-name" use="required"/>
> +        <xs:attribute name="field" use="required"/>
>     </xs:attributeGroup>
> </xs:schema>
>
> Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuCondition.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuCondition.java?rev=735966&r1=735965&r2=735966&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuCondition.java (original)
> +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuCondition.java Tue Jan 20 00:40:48 2009
> @@ -19,7 +19,6 @@
> package org.ofbiz.widget.menu;
>
> import java.lang.reflect.Method;
> -import java.util.Iterator;
> import java.util.List;
> import java.util.Locale;
> import java.util.Map;
> @@ -44,7 +43,11 @@
> import org.ofbiz.entityext.permission.EntityPermissionChecker;
> import org.ofbiz.minilang.operation.BaseCompare;
> import org.ofbiz.security.Security;
> -import org.ofbiz.service.*;
> +import org.ofbiz.service.DispatchContext;
> +import org.ofbiz.service.GenericServiceException;
> +import org.ofbiz.service.LocalDispatcher;
> +import org.ofbiz.service.ModelService;
> +import org.ofbiz.service.ServiceUtil;
> import org.w3c.dom.Element;
>
> /**
> @@ -525,7 +528,8 @@
>
>         public IfEmpty(ModelMenuItem modelMenuItem, Element condElement) {
>             super (modelMenuItem, condElement);
> -            this.fieldAcsr = FlexibleMapAccessor.getInstance(condElement.getAttribute("field-name"));
> +            this.fieldAcsr = FlexibleMapAccessor.getInstance(condElement.getAttribute("field"));
> +            if (this.fieldAcsr.isEmpty()) this.fieldAcsr =
> FlexibleMapAccessor.getInstance(condElement.getAttribute("field-name"));
>         }
>
>         public boolean eval(Map<String, Object> context) {
>
>