From acb678215c9d7375fd6fffce8c8bea078d3bd0a6 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Tue, 12 Feb 2019 15:28:09 +0100
Subject: [PATCH] relation -> contact
---
entity/Communication_entity/Communication_entity.aod | 4 ++--
.../Communication_entity/entityfields/addr/onValidation.js | 2 +-
.../code.js | 0
entity/Keyword_entity/Keyword_entity.aod | 2 +-
entity/Organisation_entity/Organisation_entity.aod | 6 +++---
.../children/containername_param/code.js | 0
6 files changed, 7 insertions(+), 7 deletions(-)
rename entity/Communication_entity/entityfields/{relationsmaincountry_param => contactsmaincountry_param}/code.js (100%)
rename entity/Organisation_entity/entityfields/{keywordrelationstates => keywordcontactstates}/children/containername_param/code.js (100%)
diff --git a/entity/Communication_entity/Communication_entity.aod b/entity/Communication_entity/Communication_entity.aod
index 8d4c2d12bf3..3e09f37f88e 100644
--- a/entity/Communication_entity/Communication_entity.aod
+++ b/entity/Communication_entity/Communication_entity.aod
@@ -47,8 +47,8 @@ Usually this is used for filtering COMMUNICATION-entires by a specified contact
<recordContainer>db</recordContainer>
</entityProvider>
<entityParameter>
- <name>RelationsMainCountry_param</name>
- <code>%aditoprj%/entity/Communication_entity/entityfields/relationsmaincountry_param/code.js</code>
+ <name>ContactsMainCountry_param</name>
+ <code>%aditoprj%/entity/Communication_entity/entityfields/contactsmaincountry_param/code.js</code>
<mandatory v="false" />
<description>PARAMETER</description>
</entityParameter>
diff --git a/entity/Communication_entity/entityfields/addr/onValidation.js b/entity/Communication_entity/entityfields/addr/onValidation.js
index 9a76546b124..d891aa3a27a 100644
--- a/entity/Communication_entity/entityfields/addr/onValidation.js
+++ b/entity/Communication_entity/entityfields/addr/onValidation.js
@@ -16,7 +16,7 @@ var fn = CommValidationUtil.makeValidationFn(commCategory);
if (fn != null){
var commAddr = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.ADDR"));
var additional = CommValidationUtil.getExtensionsBlueprint();
- additional.countryCode = vars.get("$param.RelationsMainCountry_param");//TODO: try to use users language first and then the companies
+ additional.countryCode = vars.get("$param.ContactsMainCountry_param");//TODO: try to use users language first and then the companies
var res = fn.call(null, commAddr, additional);
if (res != null)
result.string(res);
diff --git a/entity/Communication_entity/entityfields/relationsmaincountry_param/code.js b/entity/Communication_entity/entityfields/contactsmaincountry_param/code.js
similarity index 100%
rename from entity/Communication_entity/entityfields/relationsmaincountry_param/code.js
rename to entity/Communication_entity/entityfields/contactsmaincountry_param/code.js
diff --git a/entity/Keyword_entity/Keyword_entity.aod b/entity/Keyword_entity/Keyword_entity.aod
index 920e333669a..9e906046725 100644
--- a/entity/Keyword_entity/Keyword_entity.aod
+++ b/entity/Keyword_entity/Keyword_entity.aod
@@ -73,7 +73,7 @@
<entityDependency>
<name>bb48a3ee-f340-4fd4-8c80-ef73b765ab58</name>
<entityName>Organisation_entity</entityName>
- <fieldName>KeywordRelationStates</fieldName>
+ <fieldName>KeywordContactStates</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 22b12517d2f..31e7d4c1945 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -48,7 +48,7 @@
<entityField>
<name>STATUS</name>
<title>Status</title>
- <consumer>KeywordRelationStates</consumer>
+ <consumer>KeywordContactStates</consumer>
<searchable v="false" />
</entityField>
<entityField>
@@ -426,7 +426,7 @@ Usually this is used for filtering COMMUNICATION-entires by a specified contact
</children>
</entityConsumer>
<entityConsumer>
- <name>KeywordRelationStates</name>
+ <name>KeywordContactStates</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -436,7 +436,7 @@ Usually this is used for filtering COMMUNICATION-entires by a specified contact
<children>
<entityParameter>
<name>containerName_param</name>
- <code>%aditoprj%/entity/Organisation_entity/entityfields/keywordrelationstates/children/containername_param/code.js</code>
+ <code>%aditoprj%/entity/Organisation_entity/entityfields/keywordcontactstates/children/containername_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
diff --git a/entity/Organisation_entity/entityfields/keywordrelationstates/children/containername_param/code.js b/entity/Organisation_entity/entityfields/keywordcontactstates/children/containername_param/code.js
similarity index 100%
rename from entity/Organisation_entity/entityfields/keywordrelationstates/children/containername_param/code.js
rename to entity/Organisation_entity/entityfields/keywordcontactstates/children/containername_param/code.js
--
GitLab