From c61056670bae486e0fd5065bcdf69ea982f0f095 Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Tue, 23 Jul 2019 10:19:17 +0200
Subject: [PATCH] Bulk mail fix
---
.../entityfields/content/valueProcess.js | 66 +++++++++----------
1 file changed, 33 insertions(+), 33 deletions(-)
diff --git a/entity/BulkMail_entity/entityfields/content/valueProcess.js b/entity/BulkMail_entity/entityfields/content/valueProcess.js
index cdd38f9be7f..22151f28280 100644
--- a/entity/BulkMail_entity/entityfields/content/valueProcess.js
+++ b/entity/BulkMail_entity/entityfields/content/valueProcess.js
@@ -1,33 +1,33 @@
-import("Document_lib");
-import("system.util");
-import("system.result");
-import("system.vars");
-import("system.db");
-import("DocumentTemplate_lib");
-
-if (vars.get("$this.value") == null)
-{
- var upload = vars.get("$field.BINDATA");
- var template;
- if (upload)
- {
- var binData = DocumentUtil.getBindataFromUpload(upload);
- var filename = DocumentUtil.getFilenameFromUpload(upload);
- var type = DocumentUtil.getFileExtensionFromUpload(filename);
- type = ({
- "txt" : DocumentTemplate.types.TXT,
- "html" : DocumentTemplate.types.HTML,
- "htm" : DocumentTemplate.types.HTML,
- "eml" : DocumentTemplate.types.EML
- })[type];
- template = new DocumentTemplate(binData, type);
-
- }
- else
- {
- template = DocumentTemplate.loadTemplate(vars.get("$field.DOCUMENTTEMPLATE_ID"));
- }
- var content = template.getReplacedContent({}, true);
-
- result.string(content);
-}
+import("Document_lib");
+import("system.util");
+import("system.result");
+import("system.vars");
+import("system.db");
+import("DocumentTemplate_lib");
+
+if (!vars.get("$this.value"))
+{
+ var upload = vars.get("$field.BINDATA");
+ var template;
+ if (upload)
+ {
+ var binData = DocumentUtil.getBindataFromUpload(upload);
+ var filename = DocumentUtil.getFilenameFromUpload(upload);
+ var type = DocumentUtil.getFileExtensionFromUpload(filename);
+ type = ({
+ "txt" : DocumentTemplate.types.TXT,
+ "html" : DocumentTemplate.types.HTML,
+ "htm" : DocumentTemplate.types.HTML,
+ "eml" : DocumentTemplate.types.EML
+ })[type];
+ template = new DocumentTemplate(binData, type);
+
+ }
+ else
+ {
+ template = DocumentTemplate.loadTemplate(vars.get("$field.DOCUMENTTEMPLATE_ID"));
+ }
+ var content = template.getReplacedContent({}, true);
+
+ result.string(content);
+}
--
GitLab