From 4d4669cef5c556817cc6cc8caccf644e34c7c0d6 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Fri, 6 Sep 2019 14:22:26 +0200
Subject: [PATCH] Bulkmail preview bugfixes & logging cleanup
---
entity/BulkMail_entity/entityfields/bindata/onValueChange.js | 1 -
.../entityfields/content/contentTypeProcess.js | 2 +-
.../entityfields/content/displayValueProcess.js | 1 -
entity/BulkMail_entity/entityfields/content/stateProcess.js | 4 +++-
.../DocumentTemplate_entity/recordcontainers/db/onDBInsert.js | 1 -
process/Bulkmail_lib/process.js | 1 -
process/DocumentTemplate_lib/process.js | 4 ----
7 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/entity/BulkMail_entity/entityfields/bindata/onValueChange.js b/entity/BulkMail_entity/entityfields/bindata/onValueChange.js
index 5e84ced62a..e2f4b3b355 100644
--- a/entity/BulkMail_entity/entityfields/bindata/onValueChange.js
+++ b/entity/BulkMail_entity/entityfields/bindata/onValueChange.js
@@ -1,4 +1,3 @@
-import("system.logging");
import("DocumentTemplate_lib");
import("system.neon");
import("system.vars");
diff --git a/entity/BulkMail_entity/entityfields/content/contentTypeProcess.js b/entity/BulkMail_entity/entityfields/content/contentTypeProcess.js
index af8f592df3..be637432e4 100644
--- a/entity/BulkMail_entity/entityfields/content/contentTypeProcess.js
+++ b/entity/BulkMail_entity/entityfields/content/contentTypeProcess.js
@@ -5,6 +5,6 @@ import("Document_lib");
import("system.vars");
import("DocumentTemplate_lib");
-result.string(vars.get("$context.currentTemplateType") == DocumentTemplate.types.TXT// && vars.get("$sys.recordstate") != neon.OPERATINGSTATE_VIEW
+result.string(vars.get("$context.currentTemplateType") == DocumentTemplate.types.TXT && (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
? "LONG_TEXT"
: "HTML");
\ No newline at end of file
diff --git a/entity/BulkMail_entity/entityfields/content/displayValueProcess.js b/entity/BulkMail_entity/entityfields/content/displayValueProcess.js
index a2ecf36da7..eb9e6ef7f1 100644
--- a/entity/BulkMail_entity/entityfields/content/displayValueProcess.js
+++ b/entity/BulkMail_entity/entityfields/content/displayValueProcess.js
@@ -1,4 +1,3 @@
-import("system.logging");
import("Bulkmail_lib");
import("system.text");
import("Employee_lib");
diff --git a/entity/BulkMail_entity/entityfields/content/stateProcess.js b/entity/BulkMail_entity/entityfields/content/stateProcess.js
index fa18329824..618982924d 100644
--- a/entity/BulkMail_entity/entityfields/content/stateProcess.js
+++ b/entity/BulkMail_entity/entityfields/content/stateProcess.js
@@ -8,4 +8,6 @@ if (vars.get("$sys.recordstate") != neon.OPERATINGSTATE_VIEW &&
|| vars.get("$context.currentTemplateType") == DocumentTemplate.types.HTML)) // TODO: invisible for html as there are problems with images which are removed by the html-editor
{
result.string(neon.COMPONENTSTATE_INVISIBLE);
-}
\ No newline at end of file
+}
+else
+ result.string(neon.COMPONENTSTATE_EDITABLE);
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/recordcontainers/db/onDBInsert.js b/entity/DocumentTemplate_entity/recordcontainers/db/onDBInsert.js
index 880e0943ca..05dbb4ec89 100644
--- a/entity/DocumentTemplate_entity/recordcontainers/db/onDBInsert.js
+++ b/entity/DocumentTemplate_entity/recordcontainers/db/onDBInsert.js
@@ -1,4 +1,3 @@
-import("system.logging");
import("DocumentTemplate_lib");
import("system.vars");
import("Document_lib");
diff --git a/process/Bulkmail_lib/process.js b/process/Bulkmail_lib/process.js
index 06ef6fc0dc..c9f13b7ccb 100644
--- a/process/Bulkmail_lib/process.js
+++ b/process/Bulkmail_lib/process.js
@@ -1,4 +1,3 @@
-import("system.logging");
import("system.translate");
import("ActivityTask_lib");
import("system.util");
diff --git a/process/DocumentTemplate_lib/process.js b/process/DocumentTemplate_lib/process.js
index d6b04b6584..be0a5f1dca 100644
--- a/process/DocumentTemplate_lib/process.js
+++ b/process/DocumentTemplate_lib/process.js
@@ -1,4 +1,3 @@
-import("system.logging");
import("Binary_lib");
import("Communication_lib");
import("system.neon");
@@ -777,7 +776,6 @@ DocumentTemplateUtils.updateTemplateData = function (pTemplateId, pFileUpload, p
*/
DocumentTemplateUtils.getTemplateContent = function (pTemplateId, pFileUpload)
{
- logging.log(JSON.stringify([pTemplateId, pFileUpload.isFilled()], null, "\t"))
var type;
var bindata;
@@ -802,8 +800,6 @@ DocumentTemplateUtils.getTemplateContent = function (pTemplateId, pFileUpload)
}
}
- logging.log("asd" + JSON.stringify([type], null, "\t"))
-
if (type == DocumentTemplate.types.HTML || type == DocumentTemplate.types.TXT || type == DocumentTemplate.types.EML)
{
return [util.decodeBase64String(bindata), type];
--
GitLab