From 8307a7b2adc6770bce348742f48cc01403407b54 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Mon, 4 Feb 2019 15:19:03 +0100
Subject: [PATCH] refactor dfo: Activity_entity
---
.../ActivityLink_entity.aod | 2 +-
entity/Activity_entity/Activity_entity.aod | 30 +++++++++----------
.../children/assignmentname_param/code.js | 0
.../children/assignmentrowid_param/code.js | 0
.../children/assignmenttable_param/code.js | 0
.../children/objectrowid_param/code.js | 0
.../children/objecttype_param/code.js | 0
.../children/assignmentname_param/code.js | 0
.../children/assignmentrowid_param/code.js | 0
.../children/assignmenttable_param/code.js | 0
.../children/keyword_param/code.js | 0
.../children/object1rowid_param/code.js | 0
.../children/object1type_param/code.js | 0
entity/Document_entity/Document_entity.aod | 4 +--
.../ObjectRelation_entity.aod | 2 +-
.../ActivityMain_view/ActivityMain_view.aod | 4 +--
.../ActivityPreview_view.aod | 2 +-
17 files changed, 22 insertions(+), 22 deletions(-)
rename entity/Activity_entity/entityfields/{activitydocument_dfo => alldocuments}/children/assignmentname_param/code.js (100%)
rename entity/Activity_entity/entityfields/{activitydocument_dfo => alldocuments}/children/assignmentrowid_param/code.js (100%)
rename entity/Activity_entity/entityfields/{activitydocument_dfo => alldocuments}/children/assignmenttable_param/code.js (100%)
rename entity/Activity_entity/entityfields/{activitylink_dfo => links}/children/objectrowid_param/code.js (100%)
rename entity/Activity_entity/entityfields/{activitylink_dfo => links}/children/objecttype_param/code.js (100%)
rename entity/Activity_entity/entityfields/{activitymaindocument_dfo => maindocuments}/children/assignmentname_param/code.js (100%)
rename entity/Activity_entity/entityfields/{activitymaindocument_dfo => maindocuments}/children/assignmentrowid_param/code.js (100%)
rename entity/Activity_entity/entityfields/{activitymaindocument_dfo => maindocuments}/children/assignmenttable_param/code.js (100%)
rename entity/Activity_entity/entityfields/{activitymaindocument_dfo => maindocuments}/children/keyword_param/code.js (100%)
rename entity/Activity_entity/entityfields/{activityobjectrelation_dfo => objectrelations}/children/object1rowid_param/code.js (100%)
rename entity/Activity_entity/entityfields/{activityobjectrelation_dfo => objectrelations}/children/object1type_param/code.js (100%)
diff --git a/entity/ActivityLink_entity/ActivityLink_entity.aod b/entity/ActivityLink_entity/ActivityLink_entity.aod
index 280145ea2f..ab6387e257 100644
--- a/entity/ActivityLink_entity/ActivityLink_entity.aod
+++ b/entity/ActivityLink_entity/ActivityLink_entity.aod
@@ -58,7 +58,7 @@
<entityDependency>
<name>73dec28e-1c16-4b09-a665-8db44201d317</name>
<entityName>Activity_entity</entityName>
- <fieldName>ActivityLink_dfo</fieldName>
+ <fieldName>Links</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index 8c51fc3a3e..b9502f38c6 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -156,7 +156,7 @@
<documentation>%aditoprj%/entity/Activity_entity/entityfields/objectid_param/documentation.adoc</documentation>
</entityParameter>
<entityConsumer>
- <name>ActivityDocument_dfo</name>
+ <name>AllDocuments</name>
<title>Documents</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
@@ -167,20 +167,20 @@
<children>
<entityParameter>
<name>AssignmentName_param</name>
- <code>%aditoprj%/entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmentname_param/code.js</code>
+ <code>%aditoprj%/entity/Activity_entity/entityfields/alldocuments/children/assignmentname_param/code.js</code>
</entityParameter>
<entityParameter>
<name>AssignmentRowId_param</name>
- <code>%aditoprj%/entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmentrowid_param/code.js</code>
+ <code>%aditoprj%/entity/Activity_entity/entityfields/alldocuments/children/assignmentrowid_param/code.js</code>
</entityParameter>
<entityParameter>
<name>AssignmentTable_param</name>
- <code>%aditoprj%/entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmenttable_param/code.js</code>
+ <code>%aditoprj%/entity/Activity_entity/entityfields/alldocuments/children/assignmenttable_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
- <name>ActivityMainDocument_dfo</name>
+ <name>MainDocuments</name>
<title>Maindocuments</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
@@ -191,19 +191,19 @@
<children>
<entityParameter>
<name>Keyword_param</name>
- <code>%aditoprj%/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/keyword_param/code.js</code>
+ <code>%aditoprj%/entity/Activity_entity/entityfields/maindocuments/children/keyword_param/code.js</code>
</entityParameter>
<entityParameter>
<name>AssignmentTable_param</name>
- <code>%aditoprj%/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmenttable_param/code.js</code>
+ <code>%aditoprj%/entity/Activity_entity/entityfields/maindocuments/children/assignmenttable_param/code.js</code>
</entityParameter>
<entityParameter>
<name>AssignmentRowId_param</name>
- <code>%aditoprj%/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmentrowid_param/code.js</code>
+ <code>%aditoprj%/entity/Activity_entity/entityfields/maindocuments/children/assignmentrowid_param/code.js</code>
</entityParameter>
<entityParameter>
<name>AssignmentName_param</name>
- <code>%aditoprj%/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmentname_param/code.js</code>
+ <code>%aditoprj%/entity/Activity_entity/entityfields/maindocuments/children/assignmentname_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
@@ -225,7 +225,7 @@
<description>PARAMETER</description>
</entityParameter>
<entityConsumer>
- <name>ActivityObjectRelation_dfo</name>
+ <name>ObjectRelations</name>
<title>Relations</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
@@ -236,16 +236,16 @@
<children>
<entityParameter>
<name>Object1Rowid_param</name>
- <code>%aditoprj%/entity/Activity_entity/entityfields/activityobjectrelation_dfo/children/object1rowid_param/code.js</code>
+ <code>%aditoprj%/entity/Activity_entity/entityfields/objectrelations/children/object1rowid_param/code.js</code>
</entityParameter>
<entityParameter>
<name>Object1Type_param</name>
- <code>%aditoprj%/entity/Activity_entity/entityfields/activityobjectrelation_dfo/children/object1type_param/code.js</code>
+ <code>%aditoprj%/entity/Activity_entity/entityfields/objectrelations/children/object1type_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
- <name>ActivityLink_dfo</name>
+ <name>Links</name>
<title>Beziehungen</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
@@ -256,11 +256,11 @@
<children>
<entityParameter>
<name>ObjectRowid_param</name>
- <code>%aditoprj%/entity/Activity_entity/entityfields/activitylink_dfo/children/objectrowid_param/code.js</code>
+ <code>%aditoprj%/entity/Activity_entity/entityfields/links/children/objectrowid_param/code.js</code>
</entityParameter>
<entityParameter>
<name>ObjectType_param</name>
- <code>%aditoprj%/entity/Activity_entity/entityfields/activitylink_dfo/children/objecttype_param/code.js</code>
+ <code>%aditoprj%/entity/Activity_entity/entityfields/links/children/objecttype_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
diff --git a/entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmentname_param/code.js b/entity/Activity_entity/entityfields/alldocuments/children/assignmentname_param/code.js
similarity index 100%
rename from entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmentname_param/code.js
rename to entity/Activity_entity/entityfields/alldocuments/children/assignmentname_param/code.js
diff --git a/entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmentrowid_param/code.js b/entity/Activity_entity/entityfields/alldocuments/children/assignmentrowid_param/code.js
similarity index 100%
rename from entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmentrowid_param/code.js
rename to entity/Activity_entity/entityfields/alldocuments/children/assignmentrowid_param/code.js
diff --git a/entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmenttable_param/code.js b/entity/Activity_entity/entityfields/alldocuments/children/assignmenttable_param/code.js
similarity index 100%
rename from entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmenttable_param/code.js
rename to entity/Activity_entity/entityfields/alldocuments/children/assignmenttable_param/code.js
diff --git a/entity/Activity_entity/entityfields/activitylink_dfo/children/objectrowid_param/code.js b/entity/Activity_entity/entityfields/links/children/objectrowid_param/code.js
similarity index 100%
rename from entity/Activity_entity/entityfields/activitylink_dfo/children/objectrowid_param/code.js
rename to entity/Activity_entity/entityfields/links/children/objectrowid_param/code.js
diff --git a/entity/Activity_entity/entityfields/activitylink_dfo/children/objecttype_param/code.js b/entity/Activity_entity/entityfields/links/children/objecttype_param/code.js
similarity index 100%
rename from entity/Activity_entity/entityfields/activitylink_dfo/children/objecttype_param/code.js
rename to entity/Activity_entity/entityfields/links/children/objecttype_param/code.js
diff --git a/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmentname_param/code.js b/entity/Activity_entity/entityfields/maindocuments/children/assignmentname_param/code.js
similarity index 100%
rename from entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmentname_param/code.js
rename to entity/Activity_entity/entityfields/maindocuments/children/assignmentname_param/code.js
diff --git a/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmentrowid_param/code.js b/entity/Activity_entity/entityfields/maindocuments/children/assignmentrowid_param/code.js
similarity index 100%
rename from entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmentrowid_param/code.js
rename to entity/Activity_entity/entityfields/maindocuments/children/assignmentrowid_param/code.js
diff --git a/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmenttable_param/code.js b/entity/Activity_entity/entityfields/maindocuments/children/assignmenttable_param/code.js
similarity index 100%
rename from entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmenttable_param/code.js
rename to entity/Activity_entity/entityfields/maindocuments/children/assignmenttable_param/code.js
diff --git a/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/keyword_param/code.js b/entity/Activity_entity/entityfields/maindocuments/children/keyword_param/code.js
similarity index 100%
rename from entity/Activity_entity/entityfields/activitymaindocument_dfo/children/keyword_param/code.js
rename to entity/Activity_entity/entityfields/maindocuments/children/keyword_param/code.js
diff --git a/entity/Activity_entity/entityfields/activityobjectrelation_dfo/children/object1rowid_param/code.js b/entity/Activity_entity/entityfields/objectrelations/children/object1rowid_param/code.js
similarity index 100%
rename from entity/Activity_entity/entityfields/activityobjectrelation_dfo/children/object1rowid_param/code.js
rename to entity/Activity_entity/entityfields/objectrelations/children/object1rowid_param/code.js
diff --git a/entity/Activity_entity/entityfields/activityobjectrelation_dfo/children/object1type_param/code.js b/entity/Activity_entity/entityfields/objectrelations/children/object1type_param/code.js
similarity index 100%
rename from entity/Activity_entity/entityfields/activityobjectrelation_dfo/children/object1type_param/code.js
rename to entity/Activity_entity/entityfields/objectrelations/children/object1type_param/code.js
diff --git a/entity/Document_entity/Document_entity.aod b/entity/Document_entity/Document_entity.aod
index eb561e9ebc..9c3c619993 100644
--- a/entity/Document_entity/Document_entity.aod
+++ b/entity/Document_entity/Document_entity.aod
@@ -249,7 +249,7 @@
<entityDependency>
<name>d57c0122-3227-4f98-b6a5-2ae45a0c5571</name>
<entityName>Activity_entity</entityName>
- <fieldName>ActivityDocument_dfo</fieldName>
+ <fieldName>AllDocuments</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
@@ -262,7 +262,7 @@
<entityDependency>
<name>056d9a73-c9cd-44f2-828b-e9742b66fa37</name>
<entityName>Activity_entity</entityName>
- <fieldName>ActivityMainDocument_dfo</fieldName>
+ <fieldName>MainDocuments</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
diff --git a/entity/ObjectRelation_entity/ObjectRelation_entity.aod b/entity/ObjectRelation_entity/ObjectRelation_entity.aod
index 3316abde94..7c79cd0732 100644
--- a/entity/ObjectRelation_entity/ObjectRelation_entity.aod
+++ b/entity/ObjectRelation_entity/ObjectRelation_entity.aod
@@ -66,7 +66,7 @@
<entityDependency>
<name>8eb3187c-07cb-4b51-8b7e-d63e83959bdb</name>
<entityName>Activity_entity</entityName>
- <fieldName>ActivityObjectRelation_dfo</fieldName>
+ <fieldName>ObjectRelations</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
diff --git a/neonView/ActivityMain_view/ActivityMain_view.aod b/neonView/ActivityMain_view/ActivityMain_view.aod
index 0eebb1a184..d997d0fdf6 100644
--- a/neonView/ActivityMain_view/ActivityMain_view.aod
+++ b/neonView/ActivityMain_view/ActivityMain_view.aod
@@ -21,12 +21,12 @@
</neonViewReference>
<neonViewReference>
<name>7bab8dbf-b69e-412d-a604-3a6999658e10</name>
- <entityField>ActivityDocument_dfo</entityField>
+ <entityField>AllDocuments</entityField>
<view>DocumentFilter_view</view>
</neonViewReference>
<neonViewReference>
<name>6066d539-d392-4688-931a-409c10fa1fbe</name>
- <entityField>ActivityLink_dfo</entityField>
+ <entityField>Links</entityField>
<view>ActivityLinkFilter_view</view>
</neonViewReference>
</children>
diff --git a/neonView/ActivityPreview_view/ActivityPreview_view.aod b/neonView/ActivityPreview_view/ActivityPreview_view.aod
index eaa45e929f..305b2238fe 100644
--- a/neonView/ActivityPreview_view/ActivityPreview_view.aod
+++ b/neonView/ActivityPreview_view/ActivityPreview_view.aod
@@ -36,7 +36,7 @@
</genericViewTemplate>
<neonViewReference>
<name>43167618-e4dc-429b-a264-3ea95bd647f9</name>
- <entityField>ActivityMainDocument_dfo</entityField>
+ <entityField>MainDocuments</entityField>
<view>DocumentList_view</view>
</neonViewReference>
</children>
--
GitLab