Bulkmail upload check for file type

entity/BulkMail_entity/entityfields/content/valueProcess.js

@@ -9,14 +9,17 @@ import("Bulkmail_lib");
 
 if (vars.get("$sys.viewmode") == neon.FRAME_VIEWMODE_DATASET && vars.get("$this.value") == null)
 {
-    var template = BulkMailUtils.getBulkMailTemplate(vars.get("$field.BULKMAILID"), vars.get("$field.DOCUMENTTEMPLATE_ID"), false, new FileUpload(vars.get("$field.bindata")))
-    var content = util.decodeBase64String(template.content);
-    var type = template.type;
-    vars.set("$context.currentTemplateType", type);
-    result.string(content);
+    var template = BulkMailUtils.getBulkMailTemplate(vars.get("$field.BULKMAILID"), vars.get("$field.DOCUMENTTEMPLATE_ID"), false, false, new FileUpload(vars.get("$field.bindata")));
+    if (template.type)
+    {
+        var content = util.decodeBase64String(template.content);
+        var type = template.type;
+        vars.set("$context.currentTemplateType", type);
+        result.string(content);
+    }
 } 
 else if (!vars.get("$field.DOCUMENTTEMPLATE_ID"))
 {
     result.string("");
     vars.set("$context.currentTemplateType", "");
-}
\ No newline at end of file
+}

entity/SerialLetter_entity/onValidation.js

@@ -5,4 +5,4 @@ import("DocumentTemplate_lib");
 
 [content, type] = DocumentTemplateUtils.getTemplateContent(vars.get("$field.DOCUMENTTEMPLATE_ID"), new FileUpload(vars.get("$field.bindata")));
 if (type != DocumentTemplate.types.ODT && (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT))
-    result.string(DocumentTemplate.serialLetterODTOnlyMessage());
\ No newline at end of file
+    result.string(DocumentTemplate.getSerialLetterODTOnlyMessage());
\ No newline at end of file

process/Bulkmail_lib/process.js

@@ -14,6 +14,7 @@ import("Communication_lib");
 import("Email_lib");
 import("system.process");
 import("system.notification");
+import("Document_lib");
 
 /**
  * functions for bulk mails
@@ -215,11 +216,15 @@ BulkMailUtils.addRecipients = function (pBulkMailId, pContactIds)
  * @param {String} pDocumentTemplateId documentTemplate id
  * @param {Boolean} [pResolveSubtemplates=true] if true subtemplates are resolved (if the type is html)
  * @param {Boolean} [pUseTemplateAttachments=false] if true the attachments from the document template is always used
+ * @param {FileUpload} [pUpload] the upload value if a custom template is used
  * 
  * @return {DocumentTemplate} the document template, null if no content was found.
  */
-BulkMailUtils.getBulkMailTemplate = function (pBulkMailId, pDocumentTemplateId, pResolveSubtemplates, pUseTemplateAttachments)
+BulkMailUtils.getBulkMailTemplate = function (pBulkMailId, pDocumentTemplateId, pResolveSubtemplates, pUseTemplateAttachments, pUpload)
 {
+    if (pUpload.isFilled() && BulkMailUtils.isValidMimeType(pUpload.mimeType))
+        return DocumentTemplate.fromUpload(pUpload);
+        
     var bulkTemplate = DocumentTemplate.loadTemplate(pBulkMailId, "BULKMAIL", pResolveSubtemplates);
     var documentTemplate = DocumentTemplate.loadTemplate(pDocumentTemplateId, undefined, pResolveSubtemplates);
 

process/DocumentTemplate_lib/process.js

@@ -460,11 +460,11 @@ DocumentTemplate.prototype.getSerialLetterByContactIds = function (pContactIds,
         return TemplateHelper._getReplacedODT(this, replaceArray, pTableData);
     }
     
-    question.showMessage(DocumentTemplate.serialLetterODTOnlyMessage, question.INFORMATION, translate.text("Action not supported"))
+    question.showMessage(DocumentTemplate.getSerialLetterODTOnlyMessage(), question.INFORMATION, translate.text("Action not supported"))
     return null;
 }
 
-DocumentTemplate.serialLetterODTOnlyMessage = function() 
+DocumentTemplate.getSerialLetterODTOnlyMessage = function() 
 {
     return translate.text("Only .odt files are supported for bulkletters.");
 }