From 8c15e556b4a03dd71c4f7abf88af6dcfcaf83309 Mon Sep 17 00:00:00 2001
From: Tobias Feldmann <t.feldmann@adito.de>
Date: Wed, 19 Dec 2018 17:58:42 +0100
Subject: [PATCH] relation in CONTRACT with lookup
---
entity/Contract_entity/Contract_entity.aod | 9 ---------
.../entityfields/relation_id/displayValueProcess.js | 7 ++-----
.../entityfields/relation_id/linkedContextProcess.js | 4 ++--
entity/Product_entity/Product_entity.aod | 9 ---------
4 files changed, 4 insertions(+), 25 deletions(-)
diff --git a/entity/Contract_entity/Contract_entity.aod b/entity/Contract_entity/Contract_entity.aod
index 4020533a27a..9545557dab0 100644
--- a/entity/Contract_entity/Contract_entity.aod
+++ b/entity/Contract_entity/Contract_entity.aod
@@ -234,15 +234,6 @@
</entityParameter>
</children>
</entityOutgoingField>
- <entityField>
- <name>ORG_NAME</name>
- </entityField>
- <entityField>
- <name>PERS_FIRSTNAME</name>
- </entityField>
- <entityField>
- <name>PERS_LASTNAME</name>
- </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Contract_entity/entityfields/relation_id/displayValueProcess.js b/entity/Contract_entity/entityfields/relation_id/displayValueProcess.js
index 1d6c953ad45..5159f2ac239 100644
--- a/entity/Contract_entity/entityfields/relation_id/displayValueProcess.js
+++ b/entity/Contract_entity/entityfields/relation_id/displayValueProcess.js
@@ -1,9 +1,6 @@
import("system.result");
import("system.vars");
import("Relation_lib");
+import("system.neon");
-result.string(RelationUtils.getNameByPersOrg("$field.RELATION_PERS_ID",
- "$field.RELATION_ORG_ID",
- "$field.PERS_FIRSTNAME",
- "$field.PERS_LASTNAME",
- "$field.ORG_NAME"));
\ No newline at end of file
+result.string(RelationUtils.getNameByPersOrgWithRelationId(vars.getString("$field.RELATION_ID")));
\ No newline at end of file
diff --git a/entity/Contract_entity/entityfields/relation_id/linkedContextProcess.js b/entity/Contract_entity/entityfields/relation_id/linkedContextProcess.js
index 57c48f6133b..2c8672f4530 100644
--- a/entity/Contract_entity/entityfields/relation_id/linkedContextProcess.js
+++ b/entity/Contract_entity/entityfields/relation_id/linkedContextProcess.js
@@ -1,5 +1,5 @@
+import("system.vars");
import("system.result");
import("Relation_lib");
-result.string(RelationUtils.getContextByPersOrg("$field.RELATION_PERS_ID",
- "$field.RELATION_ORG_ID"));
\ No newline at end of file
+result.string(RelationUtils.getContextByRelationId(vars.getString("$field.RELATION_ID")));
\ No newline at end of file
diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod
index 7f49bcbde99..8e1eef1663e 100644
--- a/entity/Product_entity/Product_entity.aod
+++ b/entity/Product_entity/Product_entity.aod
@@ -318,15 +318,6 @@
</entityParameter>
</children>
</entityOutgoingField>
- <entityField>
- <name>PERS_FIRSTNAME</name>
- </entityField>
- <entityField>
- <name>PERS_LASTNAME</name>
- </entityField>
- <entityField>
- <name>ORG_NAME</name>
- </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
--
GitLab