svn commit: r1821616 - in /ofbiz/branches/release16.11: ./ applications/workeffort/widget/WorkEffortRequirementForms.xml

Author: jleroux
Date: Fri Jan 19 10:34:46 2018
New Revision: 1821616

URL: http://svn.apache.org/viewvc?rev=1821616&view=rev
Log:
"Applied fix from trunk framework for revision: 1821613  "
------------------------------------------------------------------------
r1821613 | jleroux | 2018-01-19 11:33:05 +0100 (ven., 19 janv. 2018) | 15 lines

Fixed: Not able to add the requirement,broken screen with the error message in
workeffort component
(OFBIZ-10122)

Steps to regenerate:
1) Open URL https://demo-trunk.ofbiz.apache.org/sfa/control/Events
2) Click on the event created.
3) To add the requirements of events, click on the "Requirements" button.
4) Add the existing requirement Id or add a new requirement. Click on Save.

Actual: Not able to add the requirement. Broken screen with the error message.

Note: Refer the screenshot attached.

Thanks: Rubia Elza Joshep for report and Yogesh Naroliya for the patch
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release16.11/   (props changed)
    ofbiz/branches/release16.11/applications/workeffort/widget/WorkEffortRequirementForms.xml

Propchange: ofbiz/branches/release16.11/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 19 10:34:46 2018
@@ -10,5 +10,5 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801262-1801263,1801273-1801274,1801303,1801318-1801319,1801336,1801340,1801346,1801349-1801350,1801359,1801742,1802657,1802766,1803525,1804656,1804843,1804847,1804859,1805143,1805558,1805880,1806036,1806220,1806266,1806269,1806951,1807597,1807890,1808834,1809399,1809429,1809594,1809741,1810102,1811794,1812387,1813600,1813617,1813647,1813833,1814277,1814319,1814349,1814501,1814591,1814642,1814644,1814709,1814873,1814928,1814934,1815059,1816264,1816273,1816289,1816291,1816297,
 1816369,1816373,1816461,1816635,1816795,1818101,1818269,1818273,1818402,1819122,1819136,1819144,1819811,1820823,1820949,1820966,1821012,1821036
+/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801262-1801263,1801273-1801274,1801303,1801318-1801319,1801336,1801340,1801346,1801349-1801350,1801359,1801742,1802657,1802766,1803525,1804656,1804843,1804847,1804859,1805143,1805558,1805880,1806036,1806220,1806266,1806269,1806951,1807597,1807890,1808834,1809399,1809429,1809594,1809741,1810102,1811794,1812387,1813600,1813617,1813647,1813833,1814277,1814319,1814349,1814501,1814591,1814642,1814644,1814709,1814873,1814928,1814934,1815059,1816264,1816273,1816289,1816291,1816297,
 1816369,1816373,1816461,1816635,1816795,1818101,1818269,1818273,1818402,1819122,1819136,1819144,1819811,1820823,1820949,1820966,1821012,1821036,1821613
 /ofbiz/trunk:1770481,1770490,1770540,1771440,1771448,1771516,1771935,1772346,1772880,1774772,1775441,1779724,1780659,1781109,1781125,1781979,1782498,1782520

Modified: ofbiz/branches/release16.11/applications/workeffort/widget/WorkEffortRequirementForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/workeffort/widget/WorkEffortRequirementForms.xml?rev=1821616&r1=1821615&r2=1821616&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/workeffort/widget/WorkEffortRequirementForms.xml (original)
+++ ofbiz/branches/release16.11/applications/workeffort/widget/WorkEffortRequirementForms.xml Fri Jan 19 10:34:46 2018
@@ -46,6 +46,7 @@ under the License.
     </form>
     <form name="AddWorkEffortRequirement" default-map-name="workRequirementFulfillment" target="createWorkEffortRequirement" title="" type="single" extends="EditRequirement"
         extends-resource="component://order/widget/ordermgr/RequirementForms.xml" header-row-style="header-row" default-table-style="basic-table">
+        <alt-target use-when="workEffortId!=null" target="createWorkEffortRequirement"/>
         <field name="workEffortId"><hidden/></field>
         <field name="requirementId"><lookup target-form-name="LookupRequirement"/></field>
         <field name="workReqFulfTypeId">