From a5e0bf76ef3a12558ae27192201e72e9500aa145 Mon Sep 17 00:00:00 2001
From: Tobias Feldmann <t.feldmann@adito.de>
Date: Mon, 17 Dec 2018 11:49:30 +0100
Subject: [PATCH] [Projekt: Entwicklung - Neon][TicketNr.: 1023712][ADDR -
Standard setzten (Aktion, Button, Darstellung)]
---
entity/Address_entity/Address_entity.aod | 11 +++++++++++
.../entityfields/is_standard/valueProcess.js | 6 ++++++
entity/Org_entity/Org_entity.aod | 18 ++++++++----------
.../children/defaultaddressid_param/code.js | 4 ++++
.../OrgEditDefaults_view.aod | 4 ++--
5 files changed, 31 insertions(+), 12 deletions(-)
create mode 100644 entity/Address_entity/entityfields/is_standard/valueProcess.js
create mode 100644 entity/Org_entity/entityfields/orgaddress_dfo/children/defaultaddressid_param/code.js
diff --git a/entity/Address_entity/Address_entity.aod b/entity/Address_entity/Address_entity.aod
index d7746f0742..29b10bb3f5 100644
--- a/entity/Address_entity/Address_entity.aod
+++ b/entity/Address_entity/Address_entity.aod
@@ -136,6 +136,17 @@
</entityDependency>
</dependencies>
</entityIncomingField>
+ <entityField>
+ <name>IS_STANDARD</name>
+ <contentType>BOOLEAN</contentType>
+ <valueProcess>%aditoprj%/entity/Address_entity/entityfields/is_standard/valueProcess.js</valueProcess>
+ </entityField>
+ <entityParameter>
+ <name>DefaultAddressId_param</name>
+ <expose v="true" />
+ <triggerRecalculation v="false" />
+ <description>PARAMETER</description>
+ </entityParameter>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Address_entity/entityfields/is_standard/valueProcess.js b/entity/Address_entity/entityfields/is_standard/valueProcess.js
new file mode 100644
index 0000000000..0f77ed1276
--- /dev/null
+++ b/entity/Address_entity/entityfields/is_standard/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.getString("$param.DefaultAddressId_param") == vars.getString("$field.ADDRESSID"));
+
+
\ No newline at end of file
diff --git a/entity/Org_entity/Org_entity.aod b/entity/Org_entity/Org_entity.aod
index 0aed7d3163..d412475a33 100644
--- a/entity/Org_entity/Org_entity.aod
+++ b/entity/Org_entity/Org_entity.aod
@@ -209,11 +209,19 @@
<code>%aditoprj%/entity/Org_entity/entityfields/orgaddress_dfo/children/relid_param/code.js</code>
<triggerRecalculation v="true" />
</entityParameter>
+ <entityParameter>
+ <name>DefaultAddressId_param</name>
+ <code>%aditoprj%/entity/Org_entity/entityfields/orgaddress_dfo/children/defaultaddressid_param/code.js</code>
+ <triggerRecalculation v="true" />
+ </entityParameter>
</children>
</entityOutgoingField>
<entityField>
<name>ADDRESS_ID</name>
+ <title>standard address</title>
+ <outgoingField>OrgAddress_dfo</outgoingField>
<searchable v="false" />
+ <state>AUTO</state>
</entityField>
<entityOutgoingField>
<name>OrgComm_dfo</name>
@@ -356,12 +364,6 @@
<possibleItemsProcess>%aditoprj%/entity/Org_entity/entityfields/weakness/possibleItemsProcess.js</possibleItemsProcess>
<searchable v="false" />
</entityField>
- <entityField>
- <name>ADDRESS_DEFAULT_ID</name>
- <title>standard address</title>
- <outgoingField>OrgAddress_dfo</outgoingField>
- <searchable v="false" />
- </entityField>
<entityActionField>
<name>OpenEditDefaultsView</name>
<fieldType>ACTION</fieldType>
@@ -496,10 +498,6 @@
<name>WEAKNESS.value</name>
<recordfield>ORG.WEAKNESS</recordfield>
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ADDRESS_DEFAULT_ID.value</name>
- <recordfield>RELATION.ADDRESS_ID</recordfield>
- </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>STANDARD_EMAIL_COMM.value</name>
<recordfield></recordfield>
diff --git a/entity/Org_entity/entityfields/orgaddress_dfo/children/defaultaddressid_param/code.js b/entity/Org_entity/entityfields/orgaddress_dfo/children/defaultaddressid_param/code.js
new file mode 100644
index 0000000000..ebdb44bcc7
--- /dev/null
+++ b/entity/Org_entity/entityfields/orgaddress_dfo/children/defaultaddressid_param/code.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.getString("$field.ADDRESS_ID"));
\ No newline at end of file
diff --git a/neonView/OrgEditDefaults_view/OrgEditDefaults_view.aod b/neonView/OrgEditDefaults_view/OrgEditDefaults_view.aod
index 3fb9a50549..5b1b4e2cb5 100644
--- a/neonView/OrgEditDefaults_view/OrgEditDefaults_view.aod
+++ b/neonView/OrgEditDefaults_view/OrgEditDefaults_view.aod
@@ -14,8 +14,8 @@
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
- <name>56daa95c-d0da-49a8-87fc-cd63b4f9b4b0</name>
- <entityField>ADDRESS_DEFAULT_ID</entityField>
+ <name>08c00d5b-fc5e-451b-8341-0e5c5172faa8</name>
+ <entityField>ADDRESS_ID</entityField>
</entityFieldLink>
<entityFieldLink>
<name>e3939d9a-6955-4a9b-bf52-d63a20ed2e9d</name>
--
GitLab