From 7ed4b272f9ba902d769bf648d0348eee6c2d833f Mon Sep 17 00:00:00 2001
From: Daniel Tran <d.tran@adito.de>
Date: Thu, 6 May 2021 12:28:37 +0200
Subject: [PATCH] =?UTF-8?q?[Projekt:=20xRM-ContactManagement][TicketNr.:?=
=?UTF-8?q?=201074059][Email=5Flib:=20Parameter=20Anzahl=20/=20Reihenfolge?=
=?UTF-8?q?=20f=C3=BCr=20EmailWritingUtils.openNewMail()=20und=20EmailWrit?=
=?UTF-8?q?ingUtils.sendReportAsMail()=20falsch.]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
process/Email_lib/process.js | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/process/Email_lib/process.js b/process/Email_lib/process.js
index 2bb2c3d1239..93e6008b16e 100644
--- a/process/Email_lib/process.js
+++ b/process/Email_lib/process.js
@@ -41,15 +41,19 @@ EmailWritingUtils.openMailTemplate = function (pToRecipients, pSenderContactId,
if (pToRecipients && typeof(pToRecipients) == "string")
pToRecipients = [pToRecipients];
- var email;
+ var email, retVal, isBinaryExistent;
+ isBinaryExistent = db.getBinaryCount("DOCUMENTTEMPLATE", "DOCUMENT", pTemplateId, SqlUtils.getBinariesAlias(), null);
- if (pTemplateId || (pBindata.bindata != "" && pBindata.bindata != null))
+ if ((pTemplateId && isBinaryExistent > 0) || (pBindata.bindata != "" && pBindata.bindata != null))
{
email = Email.fromTemplate(pTemplateId, pRecipientContactId, pBindata, pAdditionalPlaceholders);
if (!email)
email = new Email();
}
- else email = new Email();
+ else
+ {
+ email = new Email();
+ }
email.setSender(pSenderContactId);
@@ -72,9 +76,7 @@ EmailWritingUtils.openMailTemplate = function (pToRecipients, pSenderContactId,
email.subject = pSubject;
}
- var isBinaryExistent = db.getBinaryCount("DOCUMENTTEMPLATE", "DOCUMENT", pTemplateId, SqlUtils.getBinariesAlias(), null);
-
- return isBinaryExistent > 0 ? email.downloadEML(pEmailFilename) : [];
+ return email.downloadEML(pEmailFilename);
}
--
GitLab