svn commit: r810881 - in /ofbiz/branches/release09.04: ./ framework/example/widget/example/ExampleForms.xml

Author: jleroux
Date: Thu Sep  3 10:43:50 2009
New Revision: 810881

URL: http://svn.apache.org/viewvc?rev=810881&view=rev
Log:
"Applied fix from trunk for revision: 810878"
------------------------------------------------------------------------
r810878 | jleroux | 2009-09-03 12:40:22 +0200 (jeu., 03 sept. 2009) | 1 line

A patch from Nicolas Malin " EditExample form, error in drop-down" (https://issues.apache.org/jira/browse/OFBIZ-2844) - OFBIZ-2844
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release09.04/   (props changed)
    ofbiz/branches/release09.04/framework/example/widget/example/ExampleForms.xml

Propchange: ofbiz/branches/release09.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep  3 10:43:50 2009
@@ -1 +1 @@
-/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,808786-808787,808792,809141,810370,810438,810465,810807,810809,810814,810832,810
 836
+/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,808786-808787,808792,809141,810370,810438,810465,810807,810809,810814,810832,810
 836,810878

Modified: ofbiz/branches/release09.04/framework/example/widget/example/ExampleForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/example/widget/example/ExampleForms.xml?rev=810881&r1=810880&r2=810881&view=diff
==============================================================================
--- ofbiz/branches/release09.04/framework/example/widget/example/ExampleForms.xml (original)
+++ ofbiz/branches/release09.04/framework/example/widget/example/ExampleForms.xml Thu Sep  3 10:43:50 2009
@@ -133,8 +133,8 @@
         <field name="longDescription" title="${uiLabelMap.ExampleLongDescription}"/>
         <field name="anotherText">
             <drop-down allow-empty="true">
-                <option key="Explicit Option" description="${uiLabelMap.ExampleExplicitOption}"/>
-                <entity-options entity-name="ProductType" description="${description}" key-field-name="description">
+                <option key="Explicit Option" description="${uiLabelMap.ExampleExplicitOption}"/>        
+                <entity-options entity-name="ProductType" description="${description}" key-field-name="productTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>