From ffd4b5bc4f64c7a4b7d32f9019c67a43dfc7e208 Mon Sep 17 00:00:00 2001
From: "d.lechner" <d.lechner@adito.de>
Date: Wed, 29 May 2019 10:38:16 +0200
Subject: [PATCH] Changes to DocumentTemplate - Use EML instead of HTML Mail
---
.../DocumentTemplate_entity.aod | 8 --------
.../entityfields/htmltext/stateProcess.js | 14 --------------
.../entityfields/htmltext/valueProcess.js | 17 -----------------
.../recordcontainers/db/onDBInsert.js | 5 -----
.../recordcontainers/db/onDBUpdate.js | 5 -----
.../DocumentTemplateEdit_view.aod | 4 ----
6 files changed, 53 deletions(-)
delete mode 100644 entity/DocumentTemplate_entity/entityfields/htmltext/stateProcess.js
delete mode 100644 entity/DocumentTemplate_entity/entityfields/htmltext/valueProcess.js
diff --git a/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
index af70f2f13b..af59e8becb 100644
--- a/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
+++ b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
@@ -135,14 +135,6 @@
</entityParameter>
</children>
</entityConsumer>
- <entityField>
- <name>htmlText</name>
- <title>HTML</title>
- <contentType>HTML</contentType>
- <state>INVISIBLE</state>
- <stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/htmltext/stateProcess.js</stateProcess>
- <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/htmltext/valueProcess.js</valueProcess>
- </entityField>
<entityField>
<name>texText</name>
<title>Text</title>
diff --git a/entity/DocumentTemplate_entity/entityfields/htmltext/stateProcess.js b/entity/DocumentTemplate_entity/entityfields/htmltext/stateProcess.js
deleted file mode 100644
index 8c4366f8e2..0000000000
--- a/entity/DocumentTemplate_entity/entityfields/htmltext/stateProcess.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import("Document_lib");
-import("system.neon");
-import("system.result");
-import("system.vars");
-
-if(vars.get("$field.TYPE").trim() == "MAI" && vars.get("$field.BINDATA") == "")
-{
- var fileExtension = DocumentUtil.getFileExtensionFromUpload(vars.get("$field.NAME"));
-
- if(fileExtension == "html" || fileExtension == "htm" || vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
- {
- result.string(neon.COMPONENTSTATE_EDITABLE);
- }
-}
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/entityfields/htmltext/valueProcess.js b/entity/DocumentTemplate_entity/entityfields/htmltext/valueProcess.js
deleted file mode 100644
index e9a47cbe00..0000000000
--- a/entity/DocumentTemplate_entity/entityfields/htmltext/valueProcess.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import("Document_lib");
-import("system.util");
-import("system.db");
-import("system.neon");
-import("system.result");
-import("system.vars");
-
-if(vars.get("$field.TYPE").trim() == "MAI" && vars.get("$field.BINDATA") == "" && vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
-{
- var fileExtension = DocumentUtil.getFileExtensionFromUpload(vars.get("$field.NAME"));
-
- if(fileExtension == "html" || fileExtension == "htm")
- {
- var binaryId = db.cell("select ID from ASYS_BINARIES where ROW_ID = '" + vars.get("$field.DOCUMENTTEMPLATEID") + "'", "_____SYSTEMALIAS");
- result.string(util.decodeBase64String(db.getBinaryContent(binaryId, "_____SYSTEMALIAS")));
- }
-}
\ 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 7c1f848e22..0d8f6fe0d4 100644
--- a/entity/DocumentTemplate_entity/recordcontainers/db/onDBInsert.js
+++ b/entity/DocumentTemplate_entity/recordcontainers/db/onDBInsert.js
@@ -15,11 +15,6 @@ if(bindataUpload != "")
filename = DocumentUtil.getFilenameFromUpload(vars.get("$field.BINDATA"));
bindata = bindataUpload;
}
-else if(vars.get("$field.TYPE").trim() == "MAI" && vars.get("$field.htmlText") != "")
-{
- filename = vars.get("$field.NAME") + ".html";
- bindata = util.encodeBase64String(vars.get("$field.htmlText"));
-}
else if(vars.get("$field.TYPE").trim() == "TEX" && vars.get("$field.texText") != "")
{
filename = vars.get("$field.NAME") + ".txt";
diff --git a/entity/DocumentTemplate_entity/recordcontainers/db/onDBUpdate.js b/entity/DocumentTemplate_entity/recordcontainers/db/onDBUpdate.js
index 6f1b4b78d0..df234535f2 100644
--- a/entity/DocumentTemplate_entity/recordcontainers/db/onDBUpdate.js
+++ b/entity/DocumentTemplate_entity/recordcontainers/db/onDBUpdate.js
@@ -14,11 +14,6 @@ if(bindataUpload != "")
bindata = bindataUpload;
filename = DocumentUtil.getFilenameFromUpload(vars.get("$field.BINDATA"));
}
-else if(vars.get("$field.TYPE").trim() == "MAI" && vars.get("$field.htmlText") != "")
-{
- filename = vars.get("$field.NAME") + ".html";
- bindata = util.encodeBase64String(vars.get("$field.htmlText"));
-}
else if(vars.get("$field.TYPE").trim() == "TEX" && vars.get("$field.texText") != "")
{
filename = vars.get("$field.NAME") + ".txt";
diff --git a/neonView/DocumentTemplateEdit_view/DocumentTemplateEdit_view.aod b/neonView/DocumentTemplateEdit_view/DocumentTemplateEdit_view.aod
index 1cc6202cb1..ad738a5766 100644
--- a/neonView/DocumentTemplateEdit_view/DocumentTemplateEdit_view.aod
+++ b/neonView/DocumentTemplateEdit_view/DocumentTemplateEdit_view.aod
@@ -37,10 +37,6 @@
<name>c25464a6-1111-4f9f-a834-92015c2d87bc</name>
<entityField>LANGUAGE</entityField>
</entityFieldLink>
- <entityFieldLink>
- <name>850130f7-75b1-42ef-9da9-da98966d6367</name>
- <entityField>htmlText</entityField>
- </entityFieldLink>
<entityFieldLink>
<name>bf313ea8-821a-4693-8ba2-4246ad8a4f62</name>
<entityField>texText</entityField>
--
GitLab