Merge branch '2021.2.0' into '2021.2'

2021.2.0 > 2021.2

See merge request xrm/basic!1279

process/CommunicationBlacklist_lib/process.js

@@ -45,17 +45,21 @@ CommunicationBlacklist.prototype.getFilter = function ()
 
 CommunicationBlacklist.prototype.loadBlacklistRecipients = function (pBulkMailId)
 {
-    var blacklistLoadConfig = entities.createConfigForLoadingRows()
-        .fields(["CONTACT_ID"])
-        .entity("BulkMailRecipient_entity")
-        .provider("RecipientsToBeMailed")
-        .addParameter("BulkMailId_param", pBulkMailId)
-        .filter(JSON.stringify(this.filter));
-    var blacklist = entities.getRows(blacklistLoadConfig);
-    blacklist.forEach(function (recipient)
+    if (!Utils.isNullOrEmpty(this.filter.childs))   
     {
-        this.blacklistContactIds.add(recipient["CONTACT_ID"]);
-    }, this);
+        var blacklistLoadConfig = entities.createConfigForLoadingRows()
+            .fields(["CONTACT_ID"])
+            .entity("BulkMailRecipient_entity")
+            .provider("RecipientsToBeMailed")
+            .addParameter("BulkMailId_param", pBulkMailId)
+            .filter(JSON.stringify(this.filter));
+        var blacklist = entities.getRows(blacklistLoadConfig);
+        blacklist.forEach(function (recipient)
+        {
+            this.blacklistContactIds.add(recipient["CONTACT_ID"]);
+        }, this);
+    }
+    
     return this;
 }
 

process/IncomingEmailExecutor_lib/process.js

@@ -98,7 +98,6 @@ IncomingEmailExecutor.prototype.setActivityEmployeeContact = function(pContactId
     else
     {
         this.activityData.employeeContactId = pContactId;
-        this.activityData.links.push(["Person", pContactId]);
         this.activityData.employeeContactLanguage = pLanguageIso3;
     }
 }
@@ -324,12 +323,9 @@ IncomingEmailExecutor.prototype.createActivity = function(pAdditionalLinks, pIsE
         failback: []
     };
     
-    if (Utils.toBoolean(vars.get("$sys.isserver"))) 
-    {
         this.getSenderInfo().forEach(this._getProcessingFunction(true, senderContacts), this);
         this.activityData.links = this.activityData.links.concat(senderContacts.prefered.length > 0 ? senderContacts.prefered : 
                                                                     senderContacts.failback);
-    }
     
     for (var i = 0, l = this.mailRecipients.length; i < l; i++)
     {