svn commit: r1849528 - in /ofbiz/ofbiz-framework/trunk/applications/workeffort: minilang/workeffort/WorkEffortSimpleServices.xml widget/WorkEffortForms.xml

[akashjain]

Author: akashjain
Date: Sat Dec 22 09:14:36 2018
New Revision: 1849528

URL: http://svn.apache.org/viewvc?rev=1849528&view=rev
Log:
Fixed: The child event added is not listed in the Child Work Efforts. While if we add an existing event it is listed in the WorkEffort component, applied patch from jira issue (OFBIZ-10111)
Thanks, Rubia Elza Joshep and Pradeep Choudhary for your contribution.

Modified:
    ofbiz/ofbiz-framework/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml
    ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/WorkEffortForms.xml

Modified: ofbiz/ofbiz-framework/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml?rev=1849528&r1=1849527&r2=1849528&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml Sat Dec 22 09:14:36 2018
@@ -692,6 +692,8 @@ under the License.
             </if-empty>
             <set-service-fields service-name="createWorkEffortAssoc"  map="parameters" to-map="createWorkEffortAssocParams"/>
             <call-service in-map-name="createWorkEffortAssocParams" service-name="createWorkEffortAssoc"/>
+            <field-to-result field="createWorkEffortAssocParams.workEffortIdFrom" result-name="workEffortIdFrom"/>
+            <field-to-result field="createWorkEffortAssocParams.workEffortAssocTypeId" result-name="workEffortAssocTypeId"/>
         </else>
         </if-not-empty>
     </simple-method>

Modified: ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/WorkEffortForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/WorkEffortForms.xml?rev=1849528&r1=1849527&r2=1849528&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/WorkEffortForms.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/WorkEffortForms.xml Sat Dec 22 09:14:36 2018
@@ -290,6 +290,7 @@ under the License.
              the form it is extending (results in two workEffortId fields in the form)
         <field name="workEffortId"><hidden value=""/></field>
         -->
+        <alt-target use-when="workEffort==null" target="createWorkEffortAndAssoc"/>
         <field name="workEffortIdFrom"><display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName} [${workEffortId}]"/></field>
         <field name="workEffortIdTo"><lookup target-form-name="LookupWorkEffort"/></field>
         <field name="workEffortAssocTypeId">