From 48dc008c42a775e97006d16d98992b11a717ec8c Mon Sep 17 00:00:00 2001
From: Benjamin Ulrich <b.ulrich@adito.de>
Date: Mon, 3 Feb 2020 14:38:50 +0100
Subject: [PATCH] [Projekt: Entwicklung - Neon][TicketNr.: 1051275][Serienbrief
kann nicht erzeugt werden]
---
entity/SerialLetter_entity/recordcontainers/db/onDBInsert.js | 2 +-
process/Bulkmail_lib/process.js | 2 +-
process/DocumentTemplate_lib/process.js | 3 ++-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/entity/SerialLetter_entity/recordcontainers/db/onDBInsert.js b/entity/SerialLetter_entity/recordcontainers/db/onDBInsert.js
index 8b5fdc99a8..b22db28618 100644
--- a/entity/SerialLetter_entity/recordcontainers/db/onDBInsert.js
+++ b/entity/SerialLetter_entity/recordcontainers/db/onDBInsert.js
@@ -14,5 +14,5 @@ var template = DocumentTemplate.fromUpload(bindata);
if (template.content)
{
- SingleBinaryUtils.insert("SERIALLETTER", "DOCUMENT", letterId, template.content, template.filename, "");
+ SingleBinaryUtils.insert("SERIALLETTER", "SERIALLETTERFILE", letterId, template.content, template.filename, "");
}
\ No newline at end of file
diff --git a/process/Bulkmail_lib/process.js b/process/Bulkmail_lib/process.js
index ed01a6c323..06a1f162e5 100644
--- a/process/Bulkmail_lib/process.js
+++ b/process/Bulkmail_lib/process.js
@@ -433,7 +433,7 @@ SerialLetterUtils.buildSerialLetter = function (pSerialLetterId, pRecipientIds)
var contactIds = contactIdsSelect.table();
return {
- content : template.getSerialLetterByContactIds(contactIds),
+ content : template.content,
filename : template.filename,
title : title
};
diff --git a/process/DocumentTemplate_lib/process.js b/process/DocumentTemplate_lib/process.js
index 7630a1c2fe..2a4e145210 100644
--- a/process/DocumentTemplate_lib/process.js
+++ b/process/DocumentTemplate_lib/process.js
@@ -269,7 +269,8 @@ DocumentTemplate.loadTemplate = function (pAssignmentRowId, pAssignmentTable, pR
var mimeType = templateDocument[0][db.BINARY_MIMETYPE];
var type = DocumentTemplate.types.fromBinaryMetadata(templateDocument[0]);
- if (pResolveSubtemplates == undefined) pResolveSubtemplates = true;
+ if (pResolveSubtemplates == undefined)
+ pResolveSubtemplates = true;
return new DocumentTemplate(db.getBinaryContent(binaryId, alias), type, filename, pResolveSubtemplates, templateId, mimeType);
}
--
GitLab