[ofbiz-framework] branch trunk updated: Fixed: Creating a new Customer create a wrong record in CommunicationEvent (OFBIZ-12142)

This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 20e7fc5  Fixed: Creating a new Customer create a wrong record in CommunicationEvent (OFBIZ-12142)
20e7fc5 is described below

commit 20e7fc54358c42b22c81f6e4a2d43da1a9c14e0b
Author: Jacques Le Roux <[hidden email]>
AuthorDate: Mon Jan 18 19:40:35 2021 +0100

    Fixed: Creating a new Customer create a wrong record in CommunicationEvent (OFBIZ-12142)
   
    In https://markmail.org/message/pf3d3qyjfucicbj7 I initially answered:
    In demo data 13 parties use <<infoString="[hidden email]">> as in
    <ContactMech contactMechId="FRA01" contactMechTypeId="EMAIL_ADDRESS" infoString="[hidden email]"/>
    This one is loaded last. Rather
    <ContactMech contactMechId="Company" contactMechTypeId="EMAIL_ADDRESS" infoString="[hidden email]"/>
    which is the 1st one, should be loaded last.
   
    A better solution is to use "[hidden email]" in EmailServices.xml
   
    Indeed, fortunately the Company party also uses this infoString and using it in
    EmailServices.xml does not affect the integration test and should not affect
    other parts of the (only) demo data
   
    Thanks: Emad Radwan for opiniated report :) and Pritam Kute for issue analysis
---
 framework/common/minilang/email/EmailServices.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/common/minilang/email/EmailServices.xml b/framework/common/minilang/email/EmailServices.xml
index a7e9ce9..ecf6097 100644
--- a/framework/common/minilang/email/EmailServices.xml
+++ b/framework/common/minilang/email/EmailServices.xml
@@ -51,7 +51,7 @@ under the License.
             <if-not-empty field="emailTemplateSetting.fromAddress">
                 <set field="emailParams.sendFrom" from-field="emailTemplateSetting.fromAddress"/>
                 <else>
-                    <property-to-field resource="general" property="defaultFromEmailAddress" field="emailParams.sendFrom" default="[hidden email]"/>                    
+                    <property-to-field resource="general" property="defaultFromEmailAddress" field="emailParams.sendFrom" default="[hidden email]"/>
                 </else>
             </if-not-empty>
             <set field="emailParams.sendCc" from-field="emailTemplateSetting.ccAddress"/>