From ce4814c6bf36dd731547c4f2dd6254717a1c4190 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Thu, 7 Feb 2019 16:22:54 +0100
Subject: [PATCH] refactor ObjectRelation entity
---
entity/Activity_entity/Activity_entity.aod | 2 +-
entity/Contact_entity/Contact_entity.aod | 2 +-
.../ObjectRelation_entity.aod | 14 ++++----------
entity/Organisation_entity/Organisation_entity.aod | 2 +-
entity/Salesproject_entity/Salesproject_entity.aod | 2 +-
5 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index d938417de0..592e9d563a 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -179,7 +179,7 @@
<dependency>
<name>dependency</name>
<entityName>ObjectRelation_entity</entityName>
- <fieldName>ByObject1_dfi</fieldName>
+ <fieldName>Object1</fieldName>
</dependency>
<children>
<entityParameter>
diff --git a/entity/Contact_entity/Contact_entity.aod b/entity/Contact_entity/Contact_entity.aod
index 99ee24db73..216207cccd 100644
--- a/entity/Contact_entity/Contact_entity.aod
+++ b/entity/Contact_entity/Contact_entity.aod
@@ -501,7 +501,7 @@
<dependency>
<name>dependency</name>
<entityName>ObjectRelation_entity</entityName>
- <fieldName>ByAnyObject_dfi</fieldName>
+ <fieldName>AnyObject</fieldName>
</dependency>
<children>
<entityParameter>
diff --git a/entity/ObjectRelation_entity/ObjectRelation_entity.aod b/entity/ObjectRelation_entity/ObjectRelation_entity.aod
index ce309b8691..957485605d 100644
--- a/entity/ObjectRelation_entity/ObjectRelation_entity.aod
+++ b/entity/ObjectRelation_entity/ObjectRelation_entity.aod
@@ -59,7 +59,7 @@
<description>PARAMETER</description>
</entityParameter>
<entityProvider>
- <name>ByObject1_dfi</name>
+ <name>Object1</name>
<fieldType>DEPENDENCY_IN</fieldType>
<recordContainer>db</recordContainer>
<dependencies>
@@ -108,7 +108,7 @@
<description>PARAMETER</description>
</entityParameter>
<entityProvider>
- <name>ByObject2_dfi</name>
+ <name>Object2</name>
<fieldType>DEPENDENCY_IN</fieldType>
<recordContainer>db</recordContainer>
<children>
@@ -139,7 +139,7 @@
</children>
</entityProvider>
<entityProvider>
- <name>ByBothObjects_dfi</name>
+ <name>BothObjects</name>
<fieldType>DEPENDENCY_IN</fieldType>
<recordContainer>db</recordContainer>
<children>
@@ -194,7 +194,7 @@
<description>PARAMETER</description>
</entityParameter>
<entityProvider>
- <name>ByAnyObject_dfi</name>
+ <name>AnyObject</name>
<fieldType>DEPENDENCY_IN</fieldType>
<recordContainer>db</recordContainer>
<dependencies>
@@ -238,11 +238,6 @@
</entityParameter>
</children>
</entityProvider>
- <entityProvider>
- <name>test_dfi</name>
- <fieldType>DEPENDENCY_IN</fieldType>
- <recordContainer>db</recordContainer>
- </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -308,4 +303,3 @@
</dbRecordContainer>
</recordContainers>
</entity>
-
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 128211f605..471dcf5af0 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -493,7 +493,7 @@ Usually this is used for filtering COMM-entires by a specified contact or creati
<dependency>
<name>dependency</name>
<entityName>ObjectRelation_entity</entityName>
- <fieldName>ByAnyObject_dfi</fieldName>
+ <fieldName>AnyObject</fieldName>
</dependency>
<children>
<entityParameter>
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index d5db2d7161..3109225050 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -313,7 +313,7 @@
<dependency>
<name>dependency</name>
<entityName>ObjectRelation_entity</entityName>
- <fieldName>ByAnyObject_dfi</fieldName>
+ <fieldName>AnyObject</fieldName>
</dependency>
<children>
<entityParameter>
--
GitLab