From 7be76b16fc1445e7a9938a6d00a5c853a4df4ab8 Mon Sep 17 00:00:00 2001
From: "S.Listl" <s.listl@adito.de>
Date: Thu, 31 Oct 2019 14:06:07 +0000
Subject: [PATCH] Email preset sender, added caption for custom template
(cherry picked from commit c16596fd7aeecdcdf1e39ab944b73dddb08bf87c)
---
entity/Email_entity/Email_entity.aod | 1 +
entity/Letter_entity/Letter_entity.aod | 1 +
entity/SerialLetter_entity/SerialLetter_entity.aod | 1 +
language/_____LANGUAGE_de/_____LANGUAGE_de.aod | 4 ++++
process/Email_lib/process.js | 12 +++++-------
5 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/entity/Email_entity/Email_entity.aod b/entity/Email_entity/Email_entity.aod
index 13e8df73be..affd297bf0 100644
--- a/entity/Email_entity/Email_entity.aod
+++ b/entity/Email_entity/Email_entity.aod
@@ -65,6 +65,7 @@
</entityParameter>
<entityField>
<name>bindata</name>
+ <title>Custom template</title>
<contentType>FILE</contentType>
</entityField>
<entityActionField>
diff --git a/entity/Letter_entity/Letter_entity.aod b/entity/Letter_entity/Letter_entity.aod
index c62fcd44f9..282bd57b5b 100644
--- a/entity/Letter_entity/Letter_entity.aod
+++ b/entity/Letter_entity/Letter_entity.aod
@@ -38,6 +38,7 @@
</entityParameter>
<entityField>
<name>bindata</name>
+ <title>Custom template</title>
<contentType>FILE</contentType>
</entityField>
<entityActionField>
diff --git a/entity/SerialLetter_entity/SerialLetter_entity.aod b/entity/SerialLetter_entity/SerialLetter_entity.aod
index 0887853705..6c83e67306 100644
--- a/entity/SerialLetter_entity/SerialLetter_entity.aod
+++ b/entity/SerialLetter_entity/SerialLetter_entity.aod
@@ -101,6 +101,7 @@
</entityConsumer>
<entityField>
<name>bindata</name>
+ <title>Custom template</title>
<contentType>FILE</contentType>
</entityField>
<entityField>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index db47b8c3d0..e55a07738a 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -125,6 +125,10 @@
<key>Long string value</key>
<value>Langer String-Wert</value>
</entry>
+ <entry>
+ <key>Custom template</key>
+ <value>Benutzerdefinierte Vorlage</value>
+ </entry>
<entry>
<key>Attribute groups can't be selected</key>
<value>Eigenschafsgruppen können nicht verwendet werden</value>
diff --git a/process/Email_lib/process.js b/process/Email_lib/process.js
index ed3571549e..6bb71c8420 100644
--- a/process/Email_lib/process.js
+++ b/process/Email_lib/process.js
@@ -112,13 +112,8 @@ Email.fromRFC = function (pBase64RFC)
Email.fromTemplate = function (pTemplateId, pContactId, pBindata)
{
var template;
- if (pBindata && pBindata.isFilled())
- {
- if (BulkMailUtils.isValidMimeType(pBindata.mimeType))
- {
- template = new DocumentTemplate(pBindata.bindata, DocumentTemplate.types.fromMimeType(pBindata.mimeType), pBindata.filename, true);
- }
- }
+ if (pBindata && pBindata.isFilled() && BulkMailUtils.isValidMimeType(pBindata.mimeType))
+ template = new DocumentTemplate(pBindata.bindata, DocumentTemplate.types.fromMimeType(pBindata.mimeType), pBindata.filename, true);
else
{
template = DocumentTemplate.loadTemplate(pTemplateId);
@@ -220,6 +215,9 @@ Email.prototype._newMailObject = function()
mail.clearRecipients(mailId, mail.RECIPIENT_BCC);
}
+ if (this.sender)
+ mail.setSender(mailId, this.sender);
+
if (this.toRecipients.length)
mail.addRecipients(mailId, mail.RECIPIENT_TO, this.toRecipients);
--
GitLab