From 42ca533830c37aeb52509f18cfdecaf5a51ce231 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Mon, 4 Feb 2019 16:06:04 +0100
Subject: [PATCH] refactor dfi: Org_entity
---
entity/Org_entity/Org_entity.aod | 23 +++++++++++--------
entity/Relation_entity/Relation_entity.aod | 2 +-
.../SalesprojectCompetition_entity.aod | 2 +-
3 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/entity/Org_entity/Org_entity.aod b/entity/Org_entity/Org_entity.aod
index 7a83f6ffaf0..a5a0b06e930 100644
--- a/entity/Org_entity/Org_entity.aod
+++ b/entity/Org_entity/Org_entity.aod
@@ -168,16 +168,10 @@
</fields>
</entityFieldGroup>
<entityProvider>
- <name>Org_dfi</name>
+ <name>byUid</name>
<fieldType>DEPENDENCY_IN</fieldType>
<recordContainer>db</recordContainer>
<dependencies>
- <entityDependency>
- <name>a6e1d9a2-9079-4415-b56f-865df5170d5e</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>SalesprojectOrg_dfo</fieldName>
- <isConsumer v="false" />
- </entityDependency>
<entityDependency>
<name>e56d51be-aaf7-4ddc-8bed-7a4a3c42b4dd</name>
<entityName>Relation_entity</entityName>
@@ -191,6 +185,12 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>relationId_param</name>
+ <mandatory v="true" />
+ </entityParameter>
+ </children>
</entityProvider>
<entityConsumer>
<name>Addresses</name>
@@ -299,9 +299,6 @@
<name>72825dbe-c602-4c17-9aa8-546c4b61f2f9</name>
<entityName>Pers_entity</entityName>
<fieldName>Organisations</fieldName>
- <name>bfc777ca-e30a-4d86-acff-f72370b986f2</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>Organisations</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
@@ -316,6 +313,12 @@
<fieldName>CompetitionOrg_lookup_dfo</fieldName>
<isConsumer v="false" />
</entityDependency>
+ <entityDependency>
+ <name>c84fdb27-45a1-4dec-b013-af43751f6a7b</name>
+ <entityName>Salesproject_entity</entityName>
+ <fieldName>Organisations</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
</dependencies>
</entityProvider>
<entityConsumer>
diff --git a/entity/Relation_entity/Relation_entity.aod b/entity/Relation_entity/Relation_entity.aod
index 8b0453243c9..d1cfde38dbe 100644
--- a/entity/Relation_entity/Relation_entity.aod
+++ b/entity/Relation_entity/Relation_entity.aod
@@ -81,7 +81,7 @@ See RelationUtils.getRelationTypeByPersOrg for possible values</description>
<dependency>
<name>dependency</name>
<entityName>Org_entity</entityName>
- <fieldName>Org_dfi</fieldName>
+ <fieldName>byUid</fieldName>
</dependency>
<children>
<entityParameter>
diff --git a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
index cdc5edb7d7e..e1464dd2ad6 100644
--- a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
+++ b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
@@ -98,7 +98,7 @@
<dependency>
<name>dependency</name>
<entityName>Org_entity</entityName>
- <fieldName>Org_dfi</fieldName>
+ <fieldName>byUid</fieldName>
</dependency>
<children>
<entityParameter>
--
GitLab