svn commit: r684244 - in /ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form: ModelForm.java ModelFormField.java

[lektran]

Author: lektran
Date: Sat Aug  9 05:45:52 2008
New Revision: 684244

URL: http://svn.apache.org/viewvc?rev=684244&view=rev
Log:
Fixed a problem with list widgets not being able to make use of *EntityLabels.xml localization, I'm not sure if I've taken the best possible approach but the problem is solved without causing any harm as far as I can see.  Reported by Bruno Busco on the dev list.

Modified:
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java?rev=684244&r1=684243&r2=684244&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java Sat Aug  9 05:45:52 2008
@@ -1418,6 +1418,8 @@
                     localContext.put(this.getListEntryName(), item);
                 } else {
                     localContext.putAll(itemMap);
+                    this.setDefaultMapName("listEntryDefaultMap");
+                    localContext.put("listEntryDefaultMap", itemMap);
                 }
 
                 localContext.put("previousItem", previousItem);

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?rev=684244&r1=684243&r2=684244&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java Sat Aug  9 05:45:52 2008
@@ -709,7 +709,7 @@
                 if (dataMap instanceof GenericEntity) {
                     GenericEntity genEnt = (GenericEntity) dataMap;
                     if (genEnt.getModelEntity().isField(this.entryAcsr.getOriginalName())) {
-                        retVal = genEnt.get(this.entryAcsr.getOriginalName());
+                        retVal = genEnt.get(this.entryAcsr.getOriginalName(), locale);
                     } else {
                      //TODO: this may never come up, but if necessary use the FlexibleStringExander to eval the name first: String evaled = this.entryAcsr
                     }