svn commit: r1819134 - in /ofbiz/branches/release16.11: ./ applications/workeffort/config/ applications/workeffort/minilang/workeffort/ applications/workeffort/servicedef/ applications/workeffort/widget/

[Arun Patidar-4]

Author: arunpatidar
Date: Sat Dec 23 10:40:13 2017
New Revision: 1819134

URL: http://svn.apache.org/viewvc?rev=1819134&view=rev
Log:
Applied fix from trunk for revision: 1801349
===

Fixed: Error displayed while adding WorkEffort Contact Mechs.(OFBIZ-9316)
Applied slightly modified patch. Thanks Jagpreet for your contribution.

Modified:
    ofbiz/branches/release16.11/   (props changed)
    ofbiz/branches/release16.11/applications/workeffort/config/WorkEffortUiLabels.xml
    ofbiz/branches/release16.11/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml
    ofbiz/branches/release16.11/applications/workeffort/servicedef/services.xml
    ofbiz/branches/release16.11/applications/workeffort/widget/WorkEffortForms.xml

Propchange: ofbiz/branches/release16.11/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Dec 23 10:40:13 2017
@@ -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,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
+/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,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
 /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/config/WorkEffortUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/workeffort/config/WorkEffortUiLabels.xml?rev=1819134&r1=1819133&r2=1819134&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/workeffort/config/WorkEffortUiLabels.xml (original)
+++ ofbiz/branches/release16.11/applications/workeffort/config/WorkEffortUiLabels.xml Sat Dec 23 10:40:13 2017
@@ -5433,4 +5433,7 @@
     <property key="WorkEffortRequiredFieldMissingWorkEffortTypeId">
         <value xml:lang="en">Required Field Missing : WorkEffort Type Id.</value>
     </property>
+    <property key="WorkEffortRequiredFieldMissingContactMechIdOrContactMechTypeId">
+        <value xml:lang="en">Required Field Missing : At least one field is required from Contact Mech Id  or Contact Mech Type Id.</value>
+    </property>
 </resource>

Modified: ofbiz/branches/release16.11/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml?rev=1819134&r1=1819133&r2=1819134&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml (original)
+++ ofbiz/branches/release16.11/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml Sat Dec 23 10:40:13 2017
@@ -401,6 +401,13 @@ under the License.
     <simple-method method-name="createWorkEffortContactMech" short-description="Create a WorkEffortContactMech">
         <make-value value-field="newValue" entity-name="WorkEffortContactMech"/>
         <if-empty field="parameters.contactMechId">
+            <if-empty field="parameters.contactMechTypeId">
+                <add-error>
+                    <fail-property resource="WorkEffortUiLabels" property="WorkEffortRequiredFieldMissingContactMechIdOrContactMechTypeId"/>
+                </add-error>
+            </if-empty>
+            <check-errors/>
+
             <if-not-empty field="parameters.partyId">
                 <set-service-fields service-name="createPartyContactMech" map="parameters" to-map="context"/>
                 <call-service service-name="createPartyContactMech" in-map-name="context">

Modified: ofbiz/branches/release16.11/applications/workeffort/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/workeffort/servicedef/services.xml?rev=1819134&r1=1819133&r2=1819134&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/workeffort/servicedef/services.xml (original)
+++ ofbiz/branches/release16.11/applications/workeffort/servicedef/services.xml Sat Dec 23 10:40:13 2017
@@ -762,11 +762,7 @@ under the License.
         <auto-attributes entity-name="WorkEffortContactMech" mode="IN" include="nonpk" optional="true"/>
         <auto-attributes entity-name="PartyContactMech" include="all" mode="IN" optional="true"/>
         <attribute name="workEffortId" mode="IN" type="String" optional="false"></attribute>
-        <attribute name="contactMechTypeId" mode="IN" type="String" optional="false">
-            <type-validate>
-                <fail-property resource="WorkEffortUiLabels" property="WorkEffortRequiredFieldMissingContactMechTypeId"/>
-            </type-validate>
-        </attribute>
+        <attribute name="contactMechTypeId" mode="IN" type="String" optional="true"/>
         <attribute name="infoString" mode="IN" type="String" optional="true"></attribute>
         <attribute name="contactMechPurposeTypeId" type="String" mode="IN" optional="true"/>
         <attribute name="contactMechId" type="String" mode="INOUT" optional="true"/>

Modified: ofbiz/branches/release16.11/applications/workeffort/widget/WorkEffortForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/workeffort/widget/WorkEffortForms.xml?rev=1819134&r1=1819133&r2=1819134&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/workeffort/widget/WorkEffortForms.xml (original)
+++ ofbiz/branches/release16.11/applications/workeffort/widget/WorkEffortForms.xml Sat Dec 23 10:40:13 2017
@@ -1186,6 +1186,12 @@ under the License.
         header-row-style="header-row" default-table-style="basic-table">
         <field name="workEffortId"><hidden value="${parameters.workEffortId}"/></field>
         <field name="contactMechId"><lookup target-form-name="LookupContactMech"/></field>
+        <field name="contactMechTypeId" event="onchange" action="javascript:ajaxUpdateAreas('contactMechContainer,ContactMechTypeOnly,contactMechTypeId=' + this.value);">
+            <drop-down>
+                <option key="" description="${uiLabelMap.CommonNone}"/>
+                <entity-options entity-name="ContactMechType" key-field-name="contactMechTypeId"/>
+            </drop-down>
+        </field>
         <field name="comments"><text size="50"/></field>
         <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
     </form>