You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ak...@apache.org on 2018/12/22 09:23:58 UTC
svn commit: r1849529 - in /ofbiz/ofbiz-framework/branches/release17.12: ./
applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml
applications/workeffort/widget/WorkEffortForms.xml
Author: akashjain
Date: Sat Dec 22 09:23:58 2018
New Revision: 1849529
URL: http://svn.apache.org/viewvc?rev=1849529&view=rev
Log:
Applied fix from trunk for revision: 1849528
===
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/branches/release17.12/ (props changed)
ofbiz/ofbiz-framework/branches/release17.12/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml
ofbiz/ofbiz-framework/branches/release17.12/applications/workeffort/widget/WorkEffortForms.xml
Propchange: ofbiz/ofbiz-framework/branches/release17.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Dec 22 09:23:58 2018
@@ -10,4 +10,4 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1819947,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393,1823467,1823562,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825211,1825216,1825233,1825450,1826374,1826502,1826592,1826671,1826674,1826780,1826805,1826938,1826997,1827439,1828255,1828316,1828346,1828424,1828512,1828514,1829690,1830936,1831074,1831078,1831234,1831608,1831831,1832577,1832662,1832756,1832800,1832944,1833173,1833211,1834181,1834191,1834736,1835235,1835887,1835891,1835953,1835964,1836144,1836871,1837857,1838032,1838256,1838381,1840189,1840199,1840828,1841657,1841662,1842372,1842921,1843225,1843893,1844943,1845418,1845420,1845466,1845544,1845552,1845558,1845933,1845995,1846097,1846107,1846214,1846594,1846632,1847398,1847478,1847670,1847715,
1847890,1848263,1848336,1848386,1848398,1848441,1848444,1848447,1848449,1848467,1848469,1848745,1848849-1848850,1849021,1849191,1849193,1849275,1849467
+/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1819947,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393,1823467,1823562,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825211,1825216,1825233,1825450,1826374,1826502,1826592,1826671,1826674,1826780,1826805,1826938,1826997,1827439,1828255,1828316,1828346,1828424,1828512,1828514,1829690,1830936,1831074,1831078,1831234,1831608,1831831,1832577,1832662,1832756,1832800,1832944,1833173,1833211,1834181,1834191,1834736,1835235,1835887,1835891,1835953,1835964,1836144,1836871,1837857,1838032,1838256,1838381,1840189,1840199,1840828,1841657,1841662,1842372,1842921,1843225,1843893,1844943,1845418,1845420,1845466,1845544,1845552,1845558,1845933,1845995,1846097,1846107,1846214,1846594,1846632,1847398,1847478,1847670,1847715,
1847890,1848263,1848336,1848386,1848398,1848441,1848444,1848447,1848449,1848467,1848469,1848745,1848849-1848850,1849021,1849191,1849193,1849275,1849467,1849528
Modified: ofbiz/ofbiz-framework/branches/release17.12/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml?rev=1849529&r1=1849528&r2=1849529&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml Sat Dec 22 09:23:58 2018
@@ -696,6 +696,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/branches/release17.12/applications/workeffort/widget/WorkEffortForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/workeffort/widget/WorkEffortForms.xml?rev=1849529&r1=1849528&r2=1849529&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/applications/workeffort/widget/WorkEffortForms.xml (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/applications/workeffort/widget/WorkEffortForms.xml Sat Dec 22 09:23:58 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">