From fa2fb2aad9a824ee19fd98bfb7989e2f1b51b91d Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Mon, 26 Aug 2019 10:26:24 +0200
Subject: [PATCH] remove unnecessary Consumer in Member entity
---
entity/Member_entity/Member_entity.aod | 16 +---------------
.../children/contactid_param/valueProcess.js | 4 ----
entity/Person_entity/Person_entity.aod | 8 --------
3 files changed, 1 insertion(+), 27 deletions(-)
delete mode 100644 entity/Member_entity/entityfields/currentcontact/children/contactid_param/valueProcess.js
diff --git a/entity/Member_entity/Member_entity.aod b/entity/Member_entity/Member_entity.aod
index 3429f3c4a5..8afb2177ad 100644
--- a/entity/Member_entity/Member_entity.aod
+++ b/entity/Member_entity/Member_entity.aod
@@ -66,24 +66,10 @@
<title>title</title>
<state>READONLY</state>
</entityField>
- <entityConsumer>
- <name>CurrentContact</name>
- <dependency>
- <name>dependency</name>
- <entityName>Person_entity</entityName>
- <fieldName>Contact</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ContactId_param</name>
- <valueProcess>%aditoprj%/entity/Member_entity/entityfields/currentcontact/children/contactid_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
<entityField>
<name>PERSON_FULL_NAME</name>
<title>Name</title>
- <consumer>CurrentContact</consumer>
+ <consumer>Contacts</consumer>
<linkedContext>Person</linkedContext>
<state>READONLY</state>
<valueProcess>%aditoprj%/entity/Member_entity/entityfields/person_full_name/valueProcess.js</valueProcess>
diff --git a/entity/Member_entity/entityfields/currentcontact/children/contactid_param/valueProcess.js b/entity/Member_entity/entityfields/currentcontact/children/contactid_param/valueProcess.js
deleted file mode 100644
index d4c3595ca0..0000000000
--- a/entity/Member_entity/entityfields/currentcontact/children/contactid_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("system.vars");
-
-result.string(vars.getString("$field.CONTACT_ID"));
\ No newline at end of file
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 900c6c56f7..96c81fd2c9 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -310,14 +310,6 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<entityProvider>
<name>Contact</name>
<recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>12c5350a-3159-449b-a94e-d57658b4c124</name>
- <entityName>Member_entity</entityName>
- <fieldName>CurrentContact</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>OrgId_param</name>
--
GitLab