From c78ebaa2a59ec3dfb7ff29f275e75e425a850803 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Tue, 12 Feb 2019 14:02:54 +0100
Subject: [PATCH] RELATION -> CONTACT (several liquibase fixes)
---
.../children/containername_param/code.js | 2 +-
.../children/containername_param/code.js | 2 +-
.../recordfieldmappings/status.displayvalue/expression.js | 2 +-
.../data_alias/data/AditoBasic/ab_keyword_entry.xml | 2 +-
.../{init_RelationStatus.xml => init_ContactStatus.xml} | 6 +++---
others/db_changes/masterChangelog.xml | 2 +-
process/Keyword_lib/process.js | 2 +-
7 files changed, 9 insertions(+), 9 deletions(-)
rename others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/{init_RelationStatus.xml => init_ContactStatus.xml} (93%)
diff --git a/entity/Organisation_entity/entityfields/keywordrelationstates/children/containername_param/code.js b/entity/Organisation_entity/entityfields/keywordrelationstates/children/containername_param/code.js
index 90bd2931483..e01caa2834a 100644
--- a/entity/Organisation_entity/entityfields/keywordrelationstates/children/containername_param/code.js
+++ b/entity/Organisation_entity/entityfields/keywordrelationstates/children/containername_param/code.js
@@ -1,4 +1,4 @@
import("system.result");
import("Keyword_lib");
-result.string($KeywordRegistry.get.RelationStatus);
\ No newline at end of file
+result.string($KeywordRegistry.get.ContactStatus);
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/keywordrelationstatus_dfo/children/containername_param/code.js b/entity/Organisation_entity/entityfields/keywordrelationstatus_dfo/children/containername_param/code.js
index 90bd2931483..e01caa2834a 100644
--- a/entity/Organisation_entity/entityfields/keywordrelationstatus_dfo/children/containername_param/code.js
+++ b/entity/Organisation_entity/entityfields/keywordrelationstatus_dfo/children/containername_param/code.js
@@ -1,4 +1,4 @@
import("system.result");
import("Keyword_lib");
-result.string($KeywordRegistry.get.RelationStatus);
\ No newline at end of file
+result.string($KeywordRegistry.get.ContactStatus);
\ No newline at end of file
diff --git a/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js b/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
index 52339af01c5..c831d8b5a5d 100644
--- a/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
+++ b/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
@@ -1,5 +1,5 @@
import("system.result");
import("Keyword_lib");
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.RelationStatus, "CONTACT.STATUS");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.ContactStatus, "CONTACT.STATUS");
result.string(sql);
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry.xml b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry.xml
index d807e68f219..2110a2debc1 100644
--- a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry.xml
+++ b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry.xml
@@ -1,6 +1,6 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
- <include relativeToChangelogFile="true" file="ab_keyword_entry/init_RelationStatus.xml"/>
+ <include relativeToChangelogFile="true" file="ab_keyword_entry/init_ContactStatus.xml"/>
<include relativeToChangelogFile="true" file="ab_keyword_entry/init_ActivityDirection.xml"/>
<include relativeToChangelogFile="true" file="ab_keyword_entry/init_ContractPayment.xml"/>
<include relativeToChangelogFile="true" file="ab_keyword_entry/init_ContractStatus.xml"/>
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_RelationStatus.xml b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_ContactStatus.xml
similarity index 93%
rename from others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_RelationStatus.xml
rename to others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_ContactStatus.xml
index 3229efb0289..dcc9bdaa4c6 100644
--- a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_RelationStatus.xml
+++ b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_ContactStatus.xml
@@ -6,7 +6,7 @@
<column name="KEYID" value="BSIC0rel-stat-iact-b56a-71432dd92e27"/>
<column name="TITLE" value="Inactive"/>
- <column name="CONTAINER" value="RelationStatus"/>
+ <column name="CONTAINER" value="ContactStatus"/>
<column name="SORTING" valueNumeric="0"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="1"/>
@@ -16,7 +16,7 @@
<column name="KEYID" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
<column name="TITLE" value="Active"/>
- <column name="CONTAINER" value="RelationStatus"/>
+ <column name="CONTAINER" value="ContactStatus"/>
<column name="SORTING" valueNumeric="1"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="1"/>
@@ -26,7 +26,7 @@
<column name="KEYID" value="BSIC0rel-stat-0673-840d-d3f6a4d4982b"/>
<column name="TITLE" value="In review"/>
- <column name="CONTAINER" value="RelationStatus"/>
+ <column name="CONTAINER" value="ContactStatus"/>
<column name="SORTING" valueNumeric="2"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
diff --git a/others/db_changes/masterChangelog.xml b/others/db_changes/masterChangelog.xml
index a8b5a48a7cd..6f77b467c95 100644
--- a/others/db_changes/masterChangelog.xml
+++ b/others/db_changes/masterChangelog.xml
@@ -10,7 +10,7 @@
<include file="data_alias/struct/create_pers.xml"/>
<include file="data_alias/struct/create_org.xml"/>
- <include file="data_alias/struct/create_relation.xml"/>
+ <include file="data_alias/struct/create_contact.xml"/>
<include file="data_alias/struct/create_activity.xml"/>
<include file="data_alias/struct/create_activitylink.xml"/>
<include file="data_alias/struct/create_address.xml"/>
diff --git a/process/Keyword_lib/process.js b/process/Keyword_lib/process.js
index 326abe806d5..1cf80208eee 100644
--- a/process/Keyword_lib/process.js
+++ b/process/Keyword_lib/process.js
@@ -27,7 +27,7 @@ $KeywordRegistry.get = {
ContractStatus: "ContractStatus",
ContractType: "ContractType",
ActivityDirection: "ActivityDirection",
- RelationStatus: "RelationStatus",
+ ContactStatus: "ContactStatus",
Currency: "Currency",
ProductGroupcode: "ProductGroupcode",
OfferStatus: "OfferStatus",
--
GitLab