From 358e289c9648f1971532dbc541a7e02b412d4611 Mon Sep 17 00:00:00 2001
From: Tobias Feldmann <t.feldmann@adito.de>
Date: Fri, 25 Jan 2019 15:52:29 +0100
Subject: [PATCH] Language in Org_entity with Countries_entity
---
entity/Countries_Entity/Countries_Entity.aod | 6 ++++++
entity/Org_entity/Org_entity.aod | 11 +++++++++++
.../entityfields/language/displayValueProcess.js | 4 ++++
3 files changed, 21 insertions(+)
create mode 100644 entity/Org_entity/entityfields/language/displayValueProcess.js
diff --git a/entity/Countries_Entity/Countries_Entity.aod b/entity/Countries_Entity/Countries_Entity.aod
index 82ec285893d..23db1cb8d4e 100644
--- a/entity/Countries_Entity/Countries_Entity.aod
+++ b/entity/Countries_Entity/Countries_Entity.aod
@@ -22,6 +22,12 @@
<fieldName>Countries_dfo</fieldName>
<isOutgoing v="false" />
</entityDependency>
+ <entityDependency>
+ <name>8e8d1ace-3cbb-4ed7-b029-f486805605ef</name>
+ <entityName>Org_entity</entityName>
+ <fieldName>Countries_dfo</fieldName>
+ <isOutgoing v="false" />
+ </entityDependency>
</dependencies>
<children>
<entityParameter>
diff --git a/entity/Org_entity/Org_entity.aod b/entity/Org_entity/Org_entity.aod
index 0530657e991..4b8964d13b1 100644
--- a/entity/Org_entity/Org_entity.aod
+++ b/entity/Org_entity/Org_entity.aod
@@ -73,8 +73,10 @@
<entityField>
<name>LANGUAGE</name>
<title>Language</title>
+ <outgoingField>Countries_dfo</outgoingField>
<possibleItemsProcess>%aditoprj%/entity/Org_entity/entityfields/language/possibleItemsProcess.js</possibleItemsProcess>
<selectionMode>SINGLE</selectionMode>
+ <displayValueProcess>%aditoprj%/entity/Org_entity/entityfields/language/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>ORG_ID</name>
@@ -456,6 +458,15 @@
<onActionProcess>%aditoprj%/entity/Org_entity/entityfields/orgreport/onActionProcess.js</onActionProcess>
<iconId>VAADIN:FILE_TEXT_O</iconId>
</entityActionField>
+ <entityOutgoingField>
+ <name>Countries_dfo</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Countries_Entity</entityName>
+ <fieldName>ISO2_NAME</fieldName>
+ </dependency>
+ </entityOutgoingField>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Org_entity/entityfields/language/displayValueProcess.js b/entity/Org_entity/entityfields/language/displayValueProcess.js
new file mode 100644
index 00000000000..c643393b332
--- /dev/null
+++ b/entity/Org_entity/entityfields/language/displayValueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.getString("$field.LANGUAGE"));
\ No newline at end of file
--
GitLab