Skip to content
Snippets Groups Projects
Commit 7ed4b272 authored by Daniel Tran's avatar Daniel Tran
Browse files

[Projekt: xRM-ContactManagement][TicketNr.: 1074059][Email_lib: Parameter...

[Projekt: xRM-ContactManagement][TicketNr.: 1074059][Email_lib: Parameter Anzahl / Reihenfolge für EmailWritingUtils.openNewMail() und EmailWritingUtils.sendReportAsMail() falsch.]
parent 38a135e8
No related branches found
No related tags found
No related merge requests found
...@@ -41,15 +41,19 @@ EmailWritingUtils.openMailTemplate = function (pToRecipients, pSenderContactId, ...@@ -41,15 +41,19 @@ EmailWritingUtils.openMailTemplate = function (pToRecipients, pSenderContactId,
if (pToRecipients && typeof(pToRecipients) == "string") if (pToRecipients && typeof(pToRecipients) == "string")
pToRecipients = [pToRecipients]; 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); email = Email.fromTemplate(pTemplateId, pRecipientContactId, pBindata, pAdditionalPlaceholders);
if (!email) if (!email)
email = new Email(); email = new Email();
} }
else email = new Email(); else
{
email = new Email();
}
email.setSender(pSenderContactId); email.setSender(pSenderContactId);
...@@ -72,9 +76,7 @@ EmailWritingUtils.openMailTemplate = function (pToRecipients, pSenderContactId, ...@@ -72,9 +76,7 @@ EmailWritingUtils.openMailTemplate = function (pToRecipients, pSenderContactId,
email.subject = pSubject; email.subject = pSubject;
} }
var isBinaryExistent = db.getBinaryCount("DOCUMENTTEMPLATE", "DOCUMENT", pTemplateId, SqlUtils.getBinariesAlias(), null); return email.downloadEML(pEmailFilename);
return isBinaryExistent > 0 ? email.downloadEML(pEmailFilename) : [];
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment