svn commit: r1719024 - in /ofbiz/trunk/specialpurpose/example/widget/example: ExampleAjaxScreens.xml ExampleForms.xml

[zhangwei]

Author: zhangwei
Date: Thu Dec 10 08:20:29 2015
New Revision: 1719024

URL: http://svn.apache.org/viewvc?rev=1719024&view=rev
Log:
OFBIZ-6761 The action of EditExampleBackgroundSubmit form is not correct when 
creating a example

Modified:
    ofbiz/trunk/specialpurpose/example/widget/example/ExampleAjaxScreens.xml
    ofbiz/trunk/specialpurpose/example/widget/example/ExampleForms.xml

Modified: 
ofbiz/trunk/specialpurpose/example/widget/example/ExampleAjaxScreens.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/example/widget/example/ExampleAjaxScreens.xml?rev=1719024&r1=1719023&r2=1719024&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/example/widget/example/ExampleAjaxScreens.xml 
(original)
+++ ofbiz/trunk/specialpurpose/example/widget/example/ExampleAjaxScreens.xml 
Thu Dec 10 08:20:29 2015
@@ -90,7 +90,7 @@ under the License.
                 <property-map resource="ExampleUiLabels" map-name="uiLabelMap" 
global="true"/>
                 <property-map resource="CommonUiLabels" map-name="uiLabelMap" 
global="true"/>
                 <set field="exampleId" from-field="parameters.exampleId"/>
-                <entity-one entity-name="Example" value-field="example"/>
+                <entity-one entity-name="Example" value-field="ajaxExample"/>
             </actions>
             <widgets>
                 <include-form name="EditExampleBackgroundSubmit" 
location="component://example/widget/example/ExampleForms.xml"/>

Modified: ofbiz/trunk/specialpurpose/example/widget/example/ExampleForms.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/example/widget/example/ExampleForms.xml?rev=1719024&r1=1719023&r2=1719024&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/example/widget/example/ExampleForms.xml 
(original)
+++ ofbiz/trunk/specialpurpose/example/widget/example/ExampleForms.xml Thu Dec 
10 08:20:29 2015
@@ -165,6 +165,7 @@ under the License.
             <entity-one entity-name="StatusItem" value-field="currentStatus" 
auto-field-map="false">
                 <field-map field-name="statusId" 
from-field="example.statusId"/>
             </entity-one>
+            <set field="anotherText" from-field="example.anotherText"/>
         </actions>
         <alt-target use-when="example==null" target="createExample"/>
         <auto-fields-service service-name="updateExample"/>
@@ -202,7 +203,7 @@ under the License.
                 </entity-options>
             </drop-down>
         </field>
-        <field name="displayAnotherText" use-when="example!=null @and 
example.get(&quot;anotherText&quot;)!=null">
+        <field name="displayAnotherText" use-when="anotherText!=null">
             <display description="${example.anotherText}"/>
         </field>
         <field name="submitButton" use-when="example==null" 
title="${uiLabelMap.CommonCreate}"><submit button-type="button"/></field>
@@ -212,8 +213,8 @@ under the License.
     <!-- Typically, this extended form wouldn't be necessary. The parent form 
(EditExample) would
         have these settings. -->
     <form name="EditExampleBackgroundSubmit" type="single" 
extends="EditExample" target="updateExampleAjax">
-        <alt-target use-when="example==null" target="createExampleAjax"/>
-        <field name="statusId" use-when="example==null" 
title="${uiLabelMap.CommonStatus}" id-name="statusId">
+        <alt-target use-when="ajaxExample==null" target="createExampleAjax"/>
+        <field name="statusId" use-when="ajaxExample==null" 
title="${uiLabelMap.CommonStatus}" id-name="statusId">
             <drop-down allow-empty="false">
                 <entity-options entity-name="ExampleStatusItem"/>
             </drop-down>