From 2000522d0e380881cf11026986374d83b154d2c4 Mon Sep 17 00:00:00 2001
From: Tobias Feldmann <t.feldmann@adito.de>
Date: Wed, 22 Aug 2018 16:53:50 +0200
Subject: [PATCH] Anpassungen PERS, ORG, HISTORY
---
entity/History_entity/History_entity.aod | 1 +
entity/History_entity/onDBDelete.js | 6 ++++++
entity/Org_entity/Org_entity.aod | 2 +-
entity/Pers_entity/Pers_entity.aod | 1 -
.../entityfields/name_fieldgroup/valueProcess.js | 2 +-
entity/Social_entity/Social_entity.aod | 1 -
.../entityfields/youtube/valueMappingProcess.js | 0
neonView/PersMain_view/PersMain_view.aod | 5 -----
neonView/PersPreview_view/PersPreview_view.aod | 5 +++++
9 files changed, 14 insertions(+), 9 deletions(-)
create mode 100644 entity/History_entity/onDBDelete.js
delete mode 100644 entity/Social_entity/entityfields/youtube/valueMappingProcess.js
diff --git a/entity/History_entity/History_entity.aod b/entity/History_entity/History_entity.aod
index e9c64ad8d7..56a1cfe3d4 100644
--- a/entity/History_entity/History_entity.aod
+++ b/entity/History_entity/History_entity.aod
@@ -7,6 +7,7 @@
<fromClauseProcess>%aditoprj%/entity/History_entity/fromClauseProcess.js</fromClauseProcess>
<conditionProcess>%aditoprj%/entity/History_entity/conditionProcess.js</conditionProcess>
<onDBInsert>%aditoprj%/entity/History_entity/onDBInsert.js</onDBInsert>
+ <onDBDelete>%aditoprj%/entity/History_entity/onDBDelete.js</onDBDelete>
<recordContainerType>DB</recordContainerType>
<caption>History</caption>
<iconId>NEON:HISTORY</iconId>
diff --git a/entity/History_entity/onDBDelete.js b/entity/History_entity/onDBDelete.js
new file mode 100644
index 0000000000..2949aff8f6
--- /dev/null
+++ b/entity/History_entity/onDBDelete.js
@@ -0,0 +1,6 @@
+import("system.logging");
+import("system.vars");
+import("system.db");
+
+db.deleteData("HISTORYLINK", "HISTORYLINK.HISTORY_ID = '" + vars.getString("$field.HISTORYID") + "'");
+
diff --git a/entity/Org_entity/Org_entity.aod b/entity/Org_entity/Org_entity.aod
index 2f42206404..2236c4ff74 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>TEXT</contentType>
+ <contentType>LONG_TEXT</contentType>
</entityField>
<entityField>
<name>NAME</name>
diff --git a/entity/Pers_entity/Pers_entity.aod b/entity/Pers_entity/Pers_entity.aod
index 5c9dedcccd..1111157e58 100644
--- a/entity/Pers_entity/Pers_entity.aod
+++ b/entity/Pers_entity/Pers_entity.aod
@@ -118,7 +118,6 @@
<valueProcess>%aditoprj%/entity/Pers_entity/entityfields/name_fieldgroup/valueProcess.js</valueProcess>
<description>FIELDGROUP</description>
<fields>
- <element>SALUTATION</element>
<element>FIRSTNAME</element>
<element>LASTNAME</element>
</fields>
diff --git a/entity/Pers_entity/entityfields/name_fieldgroup/valueProcess.js b/entity/Pers_entity/entityfields/name_fieldgroup/valueProcess.js
index 6bbb34256d..c232487440 100644
--- a/entity/Pers_entity/entityfields/name_fieldgroup/valueProcess.js
+++ b/entity/Pers_entity/entityfields/name_fieldgroup/valueProcess.js
@@ -1,4 +1,4 @@
import("system.vars");
import("system.result");
-result.string(vars.get("$field.SALUTATION") + " " + vars.get("$field.FIRSTNAME") + " " + vars.get("$field.LASTNAME") );
\ No newline at end of file
+result.string(vars.get("$field.FIRSTNAME") + " " + vars.get("$field.LASTNAME") );
\ No newline at end of file
diff --git a/entity/Social_entity/Social_entity.aod b/entity/Social_entity/Social_entity.aod
index 7a8cfffccb..4c941ef483 100644
--- a/entity/Social_entity/Social_entity.aod
+++ b/entity/Social_entity/Social_entity.aod
@@ -30,7 +30,6 @@
<name>YOUTUBE</name>
<contentType>HTML</contentType>
<valueProcess>%aditoprj%/entity/Social_entity/entityfields/youtube/valueProcess.js</valueProcess>
- <valueMappingProcess>%aditoprj%/entity/Social_entity/entityfields/youtube/valueMappingProcess.js</valueMappingProcess>
</entityField>
<entityParameter>
<name>Account_param</name>
diff --git a/entity/Social_entity/entityfields/youtube/valueMappingProcess.js b/entity/Social_entity/entityfields/youtube/valueMappingProcess.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/neonView/PersMain_view/PersMain_view.aod b/neonView/PersMain_view/PersMain_view.aod
index 48adc67106..5f77bdaab1 100644
--- a/neonView/PersMain_view/PersMain_view.aod
+++ b/neonView/PersMain_view/PersMain_view.aod
@@ -19,10 +19,5 @@
<entityField>PersHistory_dfo</entityField>
<view>HistoryFilter_view</view>
</neonViewReference>
- <neonViewReference>
- <name>d23e96e5-24de-4aca-861e-f339b729da34</name>
- <entityField>PersAddress_dfo</entityField>
- <view>AddressFilter_view</view>
- </neonViewReference>
</children>
</neonView>
diff --git a/neonView/PersPreview_view/PersPreview_view.aod b/neonView/PersPreview_view/PersPreview_view.aod
index 1171a3ae22..d2e167f33e 100644
--- a/neonView/PersPreview_view/PersPreview_view.aod
+++ b/neonView/PersPreview_view/PersPreview_view.aod
@@ -28,8 +28,13 @@
<genericViewTemplate>
<name>PersInfo_template</name>
<showDrawer v="true" />
+ <drawerCaption>weitere Informationen</drawerCaption>
<entityField>#ENTITY</entityField>
<fields>
+ <entityFieldLink>
+ <name>b1fae414-9818-48ff-8774-c310caf34d79</name>
+ <entityField>SALUTATION</entityField>
+ </entityFieldLink>
<entityFieldLink>
<name>c12f22ff-3536-45b6-b26f-1d8de6b5aea0</name>
<entityField>TITLE</entityField>
--
GitLab