From eb0ae3871657d190997da7a121f8db123241914c Mon Sep 17 00:00:00 2001
From: "m.groppe" <m.groppe@adito.de>
Date: Wed, 10 Nov 2021 19:07:49 +0100
Subject: [PATCH] [Projekt: xRM-Marketing][TicketNr.: 2001556][Serienmail:
Versand wiederholen/fortsetzen]
---
.../alter_bulkmailrecipient_drop_problem.xml | 8 ++++++++
.../basic/2021.2.2/Bulkmail/changelog.xml | 1 +
.../Data_alias_noAudit/Data_alias_noAudit.aod | 14 --------------
.../BulkMailRecipient_entity.aod | 8 --------
.../problem.displayvalue/expression.js | 8 --------
process/KeywordRegistry_basic/process.js | 2 --
6 files changed, 9 insertions(+), 32 deletions(-)
create mode 100644 .liquibase/Data_alias/basic/2021.2.2/Bulkmail/alter_bulkmailrecipient_drop_problem.xml
delete mode 100644 entity/BulkMailRecipient_entity/recordcontainers/db/recordfieldmappings/problem.displayvalue/expression.js
diff --git a/.liquibase/Data_alias/basic/2021.2.2/Bulkmail/alter_bulkmailrecipient_drop_problem.xml b/.liquibase/Data_alias/basic/2021.2.2/Bulkmail/alter_bulkmailrecipient_drop_problem.xml
new file mode 100644
index 00000000000..025b383dbb9
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/Bulkmail/alter_bulkmailrecipient_drop_problem.xml
@@ -0,0 +1,8 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="m.groppe" id="2b6407d3-ca7c-4215-913a-1c3f216e26ff">
+ <dropColumn tableName="BULKMAILRECIPIENT" columnName="PROBLEM"/>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.2/Bulkmail/changelog.xml b/.liquibase/Data_alias/basic/2021.2.2/Bulkmail/changelog.xml
index 23bb005d50d..f29e1064b9d 100644
--- a/.liquibase/Data_alias/basic/2021.2.2/Bulkmail/changelog.xml
+++ b/.liquibase/Data_alias/basic/2021.2.2/Bulkmail/changelog.xml
@@ -4,4 +4,5 @@
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<include relativeToChangelogFile="true" file="delete_bulkmailproblem_keyword.xml"/>
<include relativeToChangelogFile="true" file="insert_bulkmail_failed_status.xml"/>
+ <include relativeToChangelogFile="true" file="alter_bulkmailrecipient_drop_problem.xml"/>
</databaseChangeLog>
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias_noAudit/Data_alias_noAudit.aod b/aliasDefinition/Data_alias_noAudit/Data_alias_noAudit.aod
index 330076bb4dc..8a340c74c49 100644
--- a/aliasDefinition/Data_alias_noAudit/Data_alias_noAudit.aod
+++ b/aliasDefinition/Data_alias_noAudit/Data_alias_noAudit.aod
@@ -7485,20 +7485,6 @@
<title></title>
<description></description>
</entityFieldDb>
- <entityFieldDb>
- <name>PROBLEM</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="36" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
<entityFieldDb>
<name>BULKMAILRECIPIENTID</name>
<dbName></dbName>
diff --git a/entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod b/entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod
index c584c9beb54..0954cd4601f 100644
--- a/entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod
+++ b/entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod
@@ -289,14 +289,6 @@
<recordfield>BULKMAILRECIPIENT.EMAIL_ADDRESS</recordfield>
<isFilterable v="true" />
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>PROBLEM.value</name>
- <recordfield>BULKMAILRECIPIENT.PROBLEM</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>PROBLEM.displayValue</name>
- <expression>%aditoprj%/entity/BulkMailRecipient_entity/recordcontainers/db/recordfieldmappings/problem.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>IS_TEST_RECIPIENT.value</name>
<recordfield>BULKMAILRECIPIENT.IS_TEST_RECIPIENT</recordfield>
diff --git a/entity/BulkMailRecipient_entity/recordcontainers/db/recordfieldmappings/problem.displayvalue/expression.js b/entity/BulkMailRecipient_entity/recordcontainers/db/recordfieldmappings/problem.displayvalue/expression.js
deleted file mode 100644
index 5ebe6375ca2..00000000000
--- a/entity/BulkMailRecipient_entity/recordcontainers/db/recordfieldmappings/problem.displayvalue/expression.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("Contact_lib");
-import("system.db");
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.bulkMailProblem(), "BULKMAILRECIPIENT.STATUS");
-result.string(sql);
diff --git a/process/KeywordRegistry_basic/process.js b/process/KeywordRegistry_basic/process.js
index 0d870f7bed1..6281fb0767f 100644
--- a/process/KeywordRegistry_basic/process.js
+++ b/process/KeywordRegistry_basic/process.js
@@ -310,8 +310,6 @@ $KeywordRegistry.orderType$credit = function(){return "ORDTYPECRED";};
$KeywordRegistry.orderType$cancellation = function(){return "ORDTYPECANC";};
$KeywordRegistry.dunningLevel = function(){return "DunningLevel";};
-$KeywordRegistry.bulkMailProblem = function(){return "BulkMailProblem";};
-
$KeywordRegistry.importStatus = function(){return "ImportStatus";};
$KeywordRegistry.importStatus$created = function(){return "CREATED";};
$KeywordRegistry.importStatus$loaded = function(){return "LOADED";};
--
GitLab