Merge branch 'marketing_2003982_small_changes' into '2021.2'

[Projekt: xRM-Marketing][TicketNr.: 2003298][[Bug] Serienmailempfänger:... See merge request xrm/basic!1637

Merge branch 'marketing_2003982_small_changes' into '2021.2'
[Projekt: xRM-Marketing][TicketNr.: 2003298][[Bug] Serienmailempfänger:... See merge request xrm/basic!1637
43eef994 · Sebastian Listl · bb37c880 · c471fad0 · 43eef994 · 43eef994
Commit 43eef994 authored 3 years ago by Sebastian Listl
--- a/entity/BulkMailRecipient_entity/entityfields/contact_id/onValueChange.js
+++ b/entity/BulkMailRecipient_entity/entityfields/contact_id/onValueChange.js
@@ -3,7 +3,7 @@ import("system.neon");
 import("system.vars");

 var contactId = vars.get("$local.value");
-if(contactId != "")
+if(contactId != "" && vars.get("$sys.recordstate") != neon.OPERATINGSTATE_VIEW)
 {
    neon.setFieldValue("$field.EMAIL_ADDRESS",CommUtil.getStandardMail(contactId));
 }
\ No newline at end of file
--- a/entity/BulkMailRecipient_entity/entityfields/email_address/dropDownProcess.js
+++ b/entity/BulkMailRecipient_entity/entityfields/email_address/dropDownProcess.js
@@ -16,7 +16,3 @@ if (contactId)
                         .table();
    result.object(emailAddresses);
 }
-else
-{
-    result.object([])
-}
--- a/entity/BulkMail_entity/BulkMail_entity.aod
+++ b/entity/BulkMail_entity/BulkMail_entity.aod
@@ -353,6 +353,12 @@
        <entityName>Interest_entity</entityName>
        <fieldName>#PROVIDER</fieldName>
      </dependency>
+      <children>
+        <entityParameter>
+          <name>OnlyActive_param</name>
+          <valueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/interests/children/onlyactive_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
    </entityConsumer>
    <entityField>
      <name>copyRecipients</name>

--- a/entity/BulkMail_entity/entityfields/interests/children/onlyactive_param/valueProcess.js
+++ b/entity/BulkMail_entity/entityfields/interests/children/onlyactive_param/valueProcess.js
+import("system.result");
+
+result.string("true");
\ No newline at end of file
--- a/entity/BulkMail_entity/entityfields/newmosaicotemplate/stateProcess.js
+++ b/entity/BulkMail_entity/entityfields/newmosaicotemplate/stateProcess.js
+import("Bulkmail_lib");
 import("system.vars");
 import("system.neon");
 import("system.result");


-if (vars.get("$field.MOSAICOTEMPLATE_ID") || vars.get("$field.DOCUMENTTEMPLATE_ID") || vars.get("$field.content"))
+if (vars.get("$field.MOSAICOTEMPLATE_ID") || vars.get("$field.DOCUMENTTEMPLATE_ID") || BulkMailUtils.isNotEmptyHtml(vars.get("$field.content")))
 {
    result.string( neon.COMPONENTSTATE_INVISIBLE);
 }        

--- a/process/Bulkmail_lib/process.js
+++ b/process/Bulkmail_lib/process.js
@@ -1169,6 +1169,18 @@ BulkMailUtils.startBulkmailWorkFlow = function(pMailLogId, pLinkId)
    }
 }

+/* Checks if the Content is just the default empty html
+ * 
+ * @param {String} pContent content
+ *
+ * @return {Boolean} true if content is not just empty html tag and not an empty string
+ **/
+
+BulkMailUtils.isNotEmptyHtml = function(pContent)
+{
+    return pContent !== "<html></html>" && pContent !== "";
+}
+


 function SerialLetterUtils () {}

--- a/process/register_rest/process.js
+++ b/process/register_rest/process.js
@@ -49,7 +49,7 @@ function _findPerson(pFirstname, pLastname, pMailAddress)
    var contactId = newSelect("CONTACT.CONTACTID")
    .from("CONTACT")
    .join("PERSON","CONTACT.PERSON_ID = PERSON.PERSONID")
-    .join("COMMUNICATION",newWhere("COMMUNICATION.OBJECT_ROWID = CONTACT.CONTACTID").and("COMMUNICATION.OBJECT_TYPE", "Contact"))
+    .join("COMMUNICATION",newWhere("COMMUNICATION.OBJECT_ROWID = CONTACT.CONTACTID").and("COMMUNICATION.OBJECT_TYPE", "Person"))
    .whereIfSet("PERSON.FIRSTNAME",pFirstname)
    .andIfSet("PERSON.LASTNAME",pLastname)
    .and("COMMUNICATION.MEDIUM_ID",$KeywordRegistry.communicationMedium$mail())
@@ -59,7 +59,7 @@ function _findPerson(pFirstname, pLastname, pMailAddress)
    if (!contactId){
        contactId = newSelect("CONTACT.CONTACTID")
        .from("CONTACT")
-        .join("COMMUNICATION",newWhere("COMMUNICATION.OBJECT_ROWID = CONTACT.CONTACTID").and("COMMUNICATION.OBJECT_TYPE", "Contact"))
+        .join("COMMUNICATION",newWhere("COMMUNICATION.OBJECT_ROWID = CONTACT.CONTACTID").and("COMMUNICATION.OBJECT_TYPE", "Person"))
        .where("COMMUNICATION.MEDIUM_ID",$KeywordRegistry.communicationMedium$mail())
        .and("COMMUNICATION.ADDR",pMailAddress)
        .and("CONTACT.PERSON_ID is not null")
@@ -116,7 +116,7 @@ function _insertPerson(pFirstname, pLastname, pMailAddress, pSalutation)
            "ISSTANDARD" : "1",
            "USER_NEW": "register_rest",
            "DATE_NEW": vars.get("$sys.date"),
-            "OBJECT_TYPE" : "Contact"
+            "OBJECT_TYPE" : "Person"
        });
        
        return contactId;