diff --git a/entity/DocumentTemplate_entity/entityfields/openhtmleditor/stateProcess.js b/entity/DocumentTemplate_entity/entityfields/openhtmleditor/stateProcess.js index c0824ad21cb8d86f3e4cd4b0729d393cb7db7870..718a96109027807c05614a94925ff71302ec524c 100644 --- a/entity/DocumentTemplate_entity/entityfields/openhtmleditor/stateProcess.js +++ b/entity/DocumentTemplate_entity/entityfields/openhtmleditor/stateProcess.js @@ -7,5 +7,12 @@ import("system.neon"); var template = DocumentTemplateUtils.getTemplate(vars.get("$field.DOCUMENTTEMPLATEID"), false); var kind = vars.get("$field.KIND"); -if(template.type == DocumentTemplate.types.HTML && kind == $KeywordRegistry.documentTemplateType$textModular() || kind == $KeywordRegistry.documentTemplateType$mail()) - result.string(neon.COMPONENTSTATE_EDITABLE); +if (template) +{ + if(template.type == DocumentTemplate.types.HTML && + kind == $KeywordRegistry.documentTemplateType$textModular() || + kind == $KeywordRegistry.documentTemplateType$mail()) + { + result.string(neon.COMPONENTSTATE_EDITABLE); + } +} diff --git a/entity/Email_entity/entityfields/sendmail/onActionProcess.js b/entity/Email_entity/entityfields/sendmail/onActionProcess.js index 0ee0af9d3e78ea7027cafebd667d54814c15e43c..8c93bbcfad19c8a77e2d8aa228f336723f2b466c 100644 --- a/entity/Email_entity/entityfields/sendmail/onActionProcess.js +++ b/entity/Email_entity/entityfields/sendmail/onActionProcess.js @@ -30,7 +30,7 @@ if (vars.exists("$param.AdditionalPlaceholders_param") && vars.get("$param.Addit }); } -var eml = EmailWritingUtils.openMailTemplate( +EmailWritingUtils.openMailTemplate( vars.get("$field.RECIPIENT"), EmployeeUtils.getCurrentContactId(), vars.get("$field.DOCUMENT_TEMPLATE"), diff --git a/entity/Letter_entity/entityfields/downloadletterandcreateactivity/onActionProcess.js b/entity/Letter_entity/entityfields/downloadletterandcreateactivity/onActionProcess.js index 0c453f91c3e8e31847be4c6cca575257597a7650..69b7b7b8cb88c489754264203262574b6ff4e2be 100644 --- a/entity/Letter_entity/entityfields/downloadletterandcreateactivity/onActionProcess.js +++ b/entity/Letter_entity/entityfields/downloadletterandcreateactivity/onActionProcess.js @@ -33,6 +33,4 @@ if (template) } ActivityUtils.createNewActivity(null, links, null, null, translate.text("Letter"), text.parseDocument(content), $KeywordRegistry.activityDirection$outgoing(), [[template.filename, content, false]]); -} -else - throw new Error("Error while using a document template: The provided template does not contain data."); \ No newline at end of file +} \ No newline at end of file diff --git a/process/Email_lib/process.js b/process/Email_lib/process.js index 8f560c533ad7994e8b1896715b41ee6aabb311b6..61787a5d831ae07d315df9530951b04849e2b560 100644 --- a/process/Email_lib/process.js +++ b/process/Email_lib/process.js @@ -34,7 +34,8 @@ function EmailWritingUtils () {} * @param {Placeholder[]} [pAdditionalPlaceholders] additional placeholders * @return {Array} the eml document as array with [filename, base64] */ -EmailWritingUtils.openMailTemplate = function (pToRecipients, pSenderContactId, pTemplateId, pRecipientContactId, pBindata, pAttachments, pSubject, pEmailFilename, pAdditionalPlaceholders) +EmailWritingUtils.openMailTemplate = function (pToRecipients, pSenderContactId, pTemplateId, pRecipientContactId, pBindata, pAttachments, pSubject, + pEmailFilename, pAdditionalPlaceholders) { if (pToRecipients && typeof(pToRecipients) == "string") pToRecipients = [pToRecipients]; @@ -66,9 +67,13 @@ EmailWritingUtils.openMailTemplate = function (pToRecipients, pSenderContactId, } if (pSubject) + { email.subject = pSubject; + } + + var isBinaryExistent = db.getBinaryCount("DOCUMENTTEMPLATE", "DOCUMENT", pTemplateId, SqlUtils.getBinariesAlias(), null); - return email.downloadEML(pEmailFilename); + return isBinaryExistent > 0 ? email.downloadEML(pEmailFilename) : []; }