svn commit: r1848445 - in /ofbiz/ofbiz-framework/branches/release17.12: ./ applications/marketing/config/MarketingUiLabels.xml applications/marketing/minilang/marketing/contact/ContactListServices.xml

[mbrohl]

Author: mbrohl
Date: Sat Dec  8 09:28:55 2018
New Revision: 1848445

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

Fixed: Missing nullcheck in service createContactListParty.
(OFBIZ-10653)

This fix adds a nullcheck for the partyEmail and provides a better
errorMessage for the in-request service call. In addition the failing
partyID will be logged for the admin to see.

Thanks Dennis Balkir for reporting and providing the patch.

Modified:
    ofbiz/ofbiz-framework/branches/release17.12/   (props changed)
    ofbiz/ofbiz-framework/branches/release17.12/applications/marketing/config/MarketingUiLabels.xml
    ofbiz/ofbiz-framework/branches/release17.12/applications/marketing/minilang/marketing/contact/ContactListServices.xml

Propchange: ofbiz/ofbiz-framework/branches/release17.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Dec  8 09:28:55 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,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,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
+/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,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,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

Modified: ofbiz/ofbiz-framework/branches/release17.12/applications/marketing/config/MarketingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/marketing/config/MarketingUiLabels.xml?rev=1848445&r1=1848444&r2=1848445&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/applications/marketing/config/MarketingUiLabels.xml (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/applications/marketing/config/MarketingUiLabels.xml Sat Dec  8 09:28:55 2018
@@ -797,6 +797,10 @@
         <value xml:lang="zh">验证电子邮件站点标识</value>
         <value xml:lang="zh-TW">驗證電子郵件站台識別</value>
     </property>
+    <property key="MarketingContactMechNotExists">
+        <value xml:lang="de">Der bevorzugte Kontaktmechanismus für Party [${partyId}] konnte nicht gefunden werden</value>
+        <value xml:lang="en">Could not find the preferred contact mechanism for party [${parameters.partyId}]</value>
+    </property>
     <property key="MarketingContactMechNotRightForContactList">
         <value xml:lang="de">Der bevorzugte Kontaktmechanismus [${preferredContactMechType.description}] ist vom falschen Typ für die Liste [${listContactMechType.description}].</value>
         <value xml:lang="en">The preferred contact mechanism [${preferredContactMechType.description}] was not of the right type for the list [${listContactMechType.description}].</value>

Modified: ofbiz/ofbiz-framework/branches/release17.12/applications/marketing/minilang/marketing/contact/ContactListServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/marketing/minilang/marketing/contact/ContactListServices.xml?rev=1848445&r1=1848444&r2=1848445&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/applications/marketing/minilang/marketing/contact/ContactListServices.xml (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/applications/marketing/minilang/marketing/contact/ContactListServices.xml Sat Dec  8 09:28:55 2018
@@ -99,18 +99,28 @@ under the License.
                     <result-to-field result-name="contactMechId" field="parameters.preferredContactMechId"/>
                 </call-service>        
             </if-empty>
-        </if-empty>    
+        </if-empty>
 
-        <make-value entity-name="ContactListParty" value-field="newEntity"/>
-        <set-nonpk-fields map="parameters" value-field="newEntity"/>
-        <set-pk-fields map="parameters" value-field="newEntity"/>
-        <if-empty field="newEntity.fromDate"><now-timestamp field="newEntity.fromDate"/></if-empty>
+        <if-not-empty field="parameters.preferredContactMechId">
+            <make-value entity-name="ContactListParty" value-field="newEntity"/>
+            <set-nonpk-fields map="parameters" value-field="newEntity"/>
+            <set-pk-fields map="parameters" value-field="newEntity"/>
+            <if-empty field="newEntity.fromDate"><now-timestamp field="newEntity.fromDate"/></if-empty>
+
+            <create-value value-field="newEntity"/>
+            <set-service-fields service-name="createContactListPartyStatus" map="newEntity" to-map="createContactListPartyStatusMap"/>
+            <set field="createContactListPartyStatusMap.baseLocation" from-field="parameters.baseLocation"/>
+            <call-service service-name="createContactListPartyStatus" in-map-name="createContactListPartyStatusMap"/>
+
+            <!-- Some parties happen to not have email addresses, this should be logged -->
+            <else>
+                <log level="info" message="Could not find the preferred contact mechanism for party [${parameters.partyId}]"/>
+                <set field="partyId" from-field="parameters.partyId"/>
+                <property-to-field resource="MarketingUiLabels.xml" property="MarketingContactMechNotExists" field="message"/>
+                <field-to-result field="message" result-name="errorMessage"></field-to-result>
+            </else>
+        </if-not-empty>
 
-        <create-value value-field="newEntity"/>
-        
-        <set-service-fields service-name="createContactListPartyStatus" map="newEntity" to-map="createContactListPartyStatusMap"/>
-        <set field="createContactListPartyStatusMap.baseLocation" from-field="parameters.baseLocation"/>
-        <call-service service-name="createContactListPartyStatus" in-map-name="createContactListPartyStatusMap"/>
     </simple-method>
     <simple-method method-name="updateContactListParty" short-description="Update Add Party To ContactList">
         <!-- allow if userLogin.partyId = parameters.partyId or has permission -->