From 7604beffe5e0144aec78a001eb414499252167b3 Mon Sep 17 00:00:00 2001
From: Tobias Feldmann <t.feldmann@adito.de>
Date: Fri, 17 Aug 2018 16:01:22 +0200
Subject: [PATCH] =?UTF-8?q?Demo-PossibleItems=20f=C3=BCr=20MEDIUM=5FID=20u?=
=?UTF-8?q?=20ADDR=5FTYPE,=20Adressen=20aus=20ORG-Slaves=20entfernt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
entity/Address_entity/Address_entity.aod | 1 +
.../entityfields/addr_type/possibleItemsProcess.js | 10 ++++++++++
entity/Comm_entity/Comm_entity.aod | 1 +
.../entityfields/medium_id/possibleItemsProcess.js | 11 +++++++++++
entity/Org_entity/Org_entity.aod | 3 ++-
neonView/OrgMain_view/OrgMain_view.aod | 5 -----
6 files changed, 25 insertions(+), 6 deletions(-)
create mode 100644 entity/Address_entity/entityfields/addr_type/possibleItemsProcess.js
create mode 100644 entity/Comm_entity/entityfields/medium_id/possibleItemsProcess.js
diff --git a/entity/Address_entity/Address_entity.aod b/entity/Address_entity/Address_entity.aod
index 830a6fff9e..640885dfe6 100644
--- a/entity/Address_entity/Address_entity.aod
+++ b/entity/Address_entity/Address_entity.aod
@@ -34,6 +34,7 @@
<tableName>ADDRESS</tableName>
<columnName>ADDR_TYPE</columnName>
<caption>Adresstyp</caption>
+ <possibleItemsProcess>%aditoprj%/entity/Address_entity/entityfields/addr_type/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
<entityField>
<name>BUILDINGNO</name>
diff --git a/entity/Address_entity/entityfields/addr_type/possibleItemsProcess.js b/entity/Address_entity/entityfields/addr_type/possibleItemsProcess.js
new file mode 100644
index 0000000000..bd3b71c3f5
--- /dev/null
+++ b/entity/Address_entity/entityfields/addr_type/possibleItemsProcess.js
@@ -0,0 +1,10 @@
+import("system.result");
+import("system.translate");
+
+var types = [
+ ["0", translate.text("Hauptadresse")]
+ ,["1", translate.text("Lieferadresse")]
+ ,["2", translate.text("Privatadresse")]
+];
+
+result.object(types);
\ No newline at end of file
diff --git a/entity/Comm_entity/Comm_entity.aod b/entity/Comm_entity/Comm_entity.aod
index 38b92f9e1d..6b23d2ef4f 100644
--- a/entity/Comm_entity/Comm_entity.aod
+++ b/entity/Comm_entity/Comm_entity.aod
@@ -36,6 +36,7 @@
<tableName>COMM</tableName>
<columnName>MEDIUM_ID</columnName>
<caption>Medium</caption>
+ <possibleItemsProcess>%aditoprj%/entity/Comm_entity/entityfields/medium_id/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
<entityField>
<name>RELATION_ID</name>
diff --git a/entity/Comm_entity/entityfields/medium_id/possibleItemsProcess.js b/entity/Comm_entity/entityfields/medium_id/possibleItemsProcess.js
new file mode 100644
index 0000000000..edb7115774
--- /dev/null
+++ b/entity/Comm_entity/entityfields/medium_id/possibleItemsProcess.js
@@ -0,0 +1,11 @@
+import("system.result");
+import("system.translate");
+
+var types = [
+ ["0", translate.text("Email")]
+ ,["1", translate.text("Telefon")]
+ ,["2", translate.text("Internet")]
+ ,["3", translate.text("Handy")]
+];
+
+result.object(types);
\ No newline at end of file
diff --git a/entity/Org_entity/Org_entity.aod b/entity/Org_entity/Org_entity.aod
index bfe5fdd3ea..2f42206404 100644
--- a/entity/Org_entity/Org_entity.aod
+++ b/entity/Org_entity/Org_entity.aod
@@ -44,7 +44,7 @@
<tableName>ORG</tableName>
<columnName>INFO</columnName>
<caption>Information</caption>
- <contentType>HTML</contentType>
+ <contentType>TEXT</contentType>
</entityField>
<entityField>
<name>NAME</name>
@@ -93,6 +93,7 @@
<columnName>LANGUAGE</columnName>
<caption>Language</caption>
<possibleItemsProcess>%aditoprj%/entity/Org_entity/entityfields/language/possibleItemsProcess.js</possibleItemsProcess>
+ <selectionMode>SINGLE</selectionMode>
</entityField>
<entityField>
<name>ORG_ID</name>
diff --git a/neonView/OrgMain_view/OrgMain_view.aod b/neonView/OrgMain_view/OrgMain_view.aod
index 402507e167..edb4bb4693 100644
--- a/neonView/OrgMain_view/OrgMain_view.aod
+++ b/neonView/OrgMain_view/OrgMain_view.aod
@@ -25,10 +25,5 @@
<entityField>PersOrg_dfo</entityField>
<view>PersFilter_view</view>
</neonViewReference>
- <neonViewReference>
- <name>cce1d1ef-cc69-455a-a2a6-3357c80bb235</name>
- <entityField>OrgAddress_dfo</entityField>
- <view>AddressFilter_view</view>
- </neonViewReference>
</children>
</neonView>
--
GitLab