From 90f3dc7bf4739ba27e2aa72fe7f93bc5ba0685ad Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Tue, 10 Sep 2019 13:17:34 +0200
Subject: [PATCH] fix: html content type wrong
---
.../content/contentTypeProcess.js | 3 +-
.../content/displayValueProcess.js | 37 +++++++++----------
2 files changed, 18 insertions(+), 22 deletions(-)
diff --git a/entity/DocumentTemplate_entity/entityfields/content/contentTypeProcess.js b/entity/DocumentTemplate_entity/entityfields/content/contentTypeProcess.js
index d59fb7111e0..bacb31baf21 100644
--- a/entity/DocumentTemplate_entity/entityfields/content/contentTypeProcess.js
+++ b/entity/DocumentTemplate_entity/entityfields/content/contentTypeProcess.js
@@ -9,8 +9,7 @@ if (vars.exists("$context.currentTemplateType"))
if (vars.get("$context.currentTemplateType") == DocumentTemplate.types.HTML)
result.string("HTML");
// force HTML for documentTemplateTypeCategory$htmlTemplate and mail if bindata is not set else use type form bindata
- else if (!vars.get("$field.BINDATA") && (vars.get("$field.CLASSIFICATION") == $KeywordRegistry.documentTemplateTypeCategory$htmlTemplate()
- || vars.get("$field.KIND") == $KeywordRegistry.documentTemplateType$mail()))
+ else if (!vars.get("$field.BINDATA") && (vars.get("$field.CLASSIFICATION") == $KeywordRegistry.documentTemplateTypeCategory$htmlTemplate()))
{
result.string("HTML");
}
diff --git a/entity/DocumentTemplate_entity/entityfields/content/displayValueProcess.js b/entity/DocumentTemplate_entity/entityfields/content/displayValueProcess.js
index 90c7db81248..8bda330861c 100644
--- a/entity/DocumentTemplate_entity/entityfields/content/displayValueProcess.js
+++ b/entity/DocumentTemplate_entity/entityfields/content/displayValueProcess.js
@@ -1,4 +1,3 @@
-import("system.logging");
import("Bulkmail_lib");
import("system.text");
import("Employee_lib");
@@ -8,25 +7,23 @@ import("system.result");
import("system.neon");
import("DocumentTemplate_lib");
-var type;
-if (!vars.exists("$context.currentTemplateType"))
- type = DocumentTemplate.types.TXT;
-else
- type = vars.get("$context.currentTemplateType");
+if (vars.exists("$context.currentTemplateType"))
+{
+ var type = vars.get("$context.currentTemplateType");
-logging.log(JSON.stringify([type], null, "\t"))
-// if this was done for every row, like in a lookup, the performance would be very bad
-if (vars.get("$sys.viewmode") == neon.FRAME_VIEWMODE_DATASET && type != null && type != DocumentTemplate.types.DOCX && type != DocumentTemplate.types.ODT)
-{
- var template = new DocumentTemplate(util.encodeBase64String(vars.get("$field.Content")), type, "unknown", true)
-
- var contactId = EmployeeUtils.getCurrentContactId();
- var preview = template.getReplacedContentByContactId(contactId, false, true);
-
- if (type == DocumentTemplate.types.TXT)
- result.string(text.text2html(preview, false));
+ // if this was done for every row, like in a lookup, the performance would be very bad
+ if (vars.get("$sys.viewmode") == neon.FRAME_VIEWMODE_DATASET && type != null && type != DocumentTemplate.types.DOCX && type != DocumentTemplate.types.ODT)
+ {
+ var template = new DocumentTemplate(util.encodeBase64String(vars.get("$field.Content")), type, "unknown", true)
+
+ var contactId = EmployeeUtils.getCurrentContactId();
+ var preview = template.getReplacedContentByContactId(contactId, false, true);
+
+ if (type == DocumentTemplate.types.TXT)
+ result.string(text.text2html(preview, false));
+ else
+ result.string(preview);
+ }
else
- result.string(preview);
+ result.string("");
}
-else
- result.string("");
\ No newline at end of file
--
GitLab