From 53392db8c9151448419818ee42407fafc5a4e087 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Wed, 29 Jan 2020 16:14:10 +0100
Subject: [PATCH] (temprorary) fixed an error that was thrown when opening GDPR
reports
---
entity/DSGVOInfo_entity/DSGVOInfo_entity.aod | 2 ++
.../entityfields/guarantee/displayValueProcess.js | 6 ++++++
.../entityfields/transmission/displayValueProcess.js | 6 ++++++
.../guarantee.displayvalue/expression.js | 7 +------
.../transmission.displayvalue/expression.js | 7 +------
5 files changed, 16 insertions(+), 12 deletions(-)
create mode 100644 entity/DSGVOInfo_entity/entityfields/guarantee/displayValueProcess.js
create mode 100644 entity/DSGVOInfo_entity/entityfields/transmission/displayValueProcess.js
diff --git a/entity/DSGVOInfo_entity/DSGVOInfo_entity.aod b/entity/DSGVOInfo_entity/DSGVOInfo_entity.aod
index f02d4a258b9..08596bfcc41 100644
--- a/entity/DSGVOInfo_entity/DSGVOInfo_entity.aod
+++ b/entity/DSGVOInfo_entity/DSGVOInfo_entity.aod
@@ -23,6 +23,7 @@
<consumer>KeywordGuarantee</consumer>
<mandatoryProcess>%aditoprj%/entity/DSGVOInfo_entity/entityfields/guarantee/mandatoryProcess.js</mandatoryProcess>
<stateProcess>%aditoprj%/entity/DSGVOInfo_entity/entityfields/guarantee/stateProcess.js</stateProcess>
+ <displayValueProcess>%aditoprj%/entity/DSGVOInfo_entity/entityfields/guarantee/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>DATASOURCE</name>
@@ -112,6 +113,7 @@
<title>Transmission</title>
<consumer>KeywordTransmission</consumer>
<mandatory v="true" />
+ <displayValueProcess>%aditoprj%/entity/DSGVOInfo_entity/entityfields/transmission/displayValueProcess.js</displayValueProcess>
<onValueChange>%aditoprj%/entity/DSGVOInfo_entity/entityfields/transmission/onValueChange.js</onValueChange>
<onValueChangeTypes>
<element>MASK</element>
diff --git a/entity/DSGVOInfo_entity/entityfields/guarantee/displayValueProcess.js b/entity/DSGVOInfo_entity/entityfields/guarantee/displayValueProcess.js
new file mode 100644
index 00000000000..a0b1a31ab41
--- /dev/null
+++ b/entity/DSGVOInfo_entity/entityfields/guarantee/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.dsgvoGuarantee(), vars.get("$field.GUARANTEE")));
diff --git a/entity/DSGVOInfo_entity/entityfields/transmission/displayValueProcess.js b/entity/DSGVOInfo_entity/entityfields/transmission/displayValueProcess.js
new file mode 100644
index 00000000000..77d6d54a39f
--- /dev/null
+++ b/entity/DSGVOInfo_entity/entityfields/transmission/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.dsgvoTransmission(), vars.get("$field.TRANSMISSION")));
diff --git a/entity/DSGVOInfo_entity/recordcontainers/db/recordfieldmappings/guarantee.displayvalue/expression.js b/entity/DSGVOInfo_entity/recordcontainers/db/recordfieldmappings/guarantee.displayvalue/expression.js
index b51d9069c3f..62c4b7fe22d 100644
--- a/entity/DSGVOInfo_entity/recordcontainers/db/recordfieldmappings/guarantee.displayvalue/expression.js
+++ b/entity/DSGVOInfo_entity/recordcontainers/db/recordfieldmappings/guarantee.displayvalue/expression.js
@@ -1,6 +1 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.dsgvoGuarantee(), "DSGVOINFO.GUARANTEE");
-result.string(sql);
+//temporarly removed since this process woul'd cause problems when generating an GDPR report //TODO: reenable this process
\ No newline at end of file
diff --git a/entity/DSGVOInfo_entity/recordcontainers/db/recordfieldmappings/transmission.displayvalue/expression.js b/entity/DSGVOInfo_entity/recordcontainers/db/recordfieldmappings/transmission.displayvalue/expression.js
index 1cd3f3f3f24..62c4b7fe22d 100644
--- a/entity/DSGVOInfo_entity/recordcontainers/db/recordfieldmappings/transmission.displayvalue/expression.js
+++ b/entity/DSGVOInfo_entity/recordcontainers/db/recordfieldmappings/transmission.displayvalue/expression.js
@@ -1,6 +1 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.dsgvoTransmission(), "DSGVOINFO.TRANSMISSION");
-result.string(sql);
+//temporarly removed since this process woul'd cause problems when generating an GDPR report //TODO: reenable this process
\ No newline at end of file
--
GitLab