Re: svn commit: r540174 - /ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java

[David E Jones <jo...@undersunconsulting.com>]

Thanks Jacopo for reversing that. This looks correct again now, the idea being that if the dataMap is a GenericEntity and the text field is not a field of that entity then it won't match.

I did just realize there is another problem with this as it's totally valid for there to be a ${} in the original name... so I'll fix it to handle that.

-David


jacopoc@apache.org wrote:
> Author: jacopoc
> Date: Mon May 21 08:30:57 2007
> New Revision: 540174
> 
> URL: http://svn.apache.org/viewvc?view=rev&rev=540174
> Log:
> After reading again David Jones's comment, I've slightly modified my previous patch.
> Please David, review if you can.
> 
> Modified:
>     ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java
> 
> Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java?view=diff&rev=540174&r1=540173&r2=540174
> ==============================================================================
> --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java (original)
> +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java Mon May 21 08:30:57 2007
> @@ -642,8 +642,6 @@
>                      GenericEntity genEnt = (GenericEntity) dataMap;
>                      if (genEnt.getModelEntity().isField(this.entryAcsr.getOriginalName())) {
>                          retVal = genEnt.get(this.entryAcsr.getOriginalName());
> -                    } else {
> -                        retVal = this.entryAcsr.get(dataMap);
>                      }
>                  } else {
>                      retVal = this.entryAcsr.get(dataMap);
> 
>