From d23d40b9a92ee6189dae202c4605c29f794e442d Mon Sep 17 00:00:00 2001
From: "M.Bilda" <m.bilda@adito.de>
Date: Thu, 29 Oct 2020 10:31:55 +0100
Subject: [PATCH] Rename Entity with _entity
---
entity/Document_entity/Document_entity.aod | 88 +++++++++----------
.../UserhelpResources_entity.aod} | 18 ++--
.../documentation.adoc | 0
.../assignmentrowid_param/valueProcess.js | 0
.../assignmenttable_param/valueProcess.js | 0
neonContext/Userhelp/Userhelp.aod | 2 +-
6 files changed, 54 insertions(+), 54 deletions(-)
rename entity/{UserhelpResources/UserhelpResources.aod => UserhelpResources_entity/UserhelpResources_entity.aod} (70%)
rename entity/{UserhelpResources => UserhelpResources_entity}/documentation.adoc (100%)
rename entity/{UserhelpResources => UserhelpResources_entity}/entityfields/documents/children/assignmentrowid_param/valueProcess.js (100%)
rename entity/{UserhelpResources => UserhelpResources_entity}/entityfields/documents/children/assignmenttable_param/valueProcess.js (100%)
diff --git a/entity/Document_entity/Document_entity.aod b/entity/Document_entity/Document_entity.aod
index 420157a371..cba9173b17 100644
--- a/entity/Document_entity/Document_entity.aod
+++ b/entity/Document_entity/Document_entity.aod
@@ -144,6 +144,26 @@
<entityProvider>
<name>Documents</name>
<recordContainer>jdito</recordContainer>
+ <children>
+ <entityParameter>
+ <name>AssignmentName_param</name>
+ <valueProcess>%aditoprj%/entity/Document_entity/entityfields/documents/children/assignmentname_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ <documentation>%aditoprj%/entity/Document_entity/entityfields/documents/children/assignmentname_param/documentation.adoc</documentation>
+ </entityParameter>
+ <entityParameter>
+ <name>AssignmentRowId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>AssignmentTable_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>Keyword_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
<dependencies>
<entityDependency>
<name>1eae1907-53ea-4d6f-bcf1-772052365020</name>
@@ -225,7 +245,7 @@
</entityDependency>
<entityDependency>
<name>2e6fcf27-ee98-4f7d-a99d-7ce02774076b</name>
- <entityName>UserhelpResources</entityName>
+ <entityName>UserhelpResources_entity</entityName>
<fieldName>Documents</fieldName>
<isConsumer v="false" />
</entityDependency>
@@ -242,12 +262,23 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ </entityProvider>
+ <entityProvider>
+ <name>MainDocuments</name>
+ <recordContainer>jdito</recordContainer>
<children>
+ <entityParameter>
+ <name>Keyword_param</name>
+ <valueProcess>%aditoprj%/entity/Document_entity/entityfields/maindocuments/children/keyword_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ <mandatory v="true" />
+ <description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
+ </entityParameter>
<entityParameter>
<name>AssignmentName_param</name>
- <valueProcess>%aditoprj%/entity/Document_entity/entityfields/documents/children/assignmentname_param/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Document_entity/entityfields/maindocuments/children/assignmentname_param/valueProcess.js</valueProcess>
<expose v="true" />
- <documentation>%aditoprj%/entity/Document_entity/entityfields/documents/children/assignmentname_param/documentation.adoc</documentation>
+ <documentation>%aditoprj%/entity/Document_entity/entityfields/maindocuments/children/assignmentname_param/documentation.adoc</documentation>
</entityParameter>
<entityParameter>
<name>AssignmentRowId_param</name>
@@ -258,14 +289,10 @@
<expose v="true" />
</entityParameter>
<entityParameter>
- <name>Keyword_param</name>
- <expose v="true" />
+ <name>DisallowCreate_param</name>
+ <expose v="false" />
</entityParameter>
</children>
- </entityProvider>
- <entityProvider>
- <name>MainDocuments</name>
- <recordContainer>jdito</recordContainer>
<dependencies>
<entityDependency>
<name>87d738a5-5d5e-425e-b013-007371475a38</name>
@@ -310,33 +337,6 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
- <children>
- <entityParameter>
- <name>Keyword_param</name>
- <valueProcess>%aditoprj%/entity/Document_entity/entityfields/maindocuments/children/keyword_param/valueProcess.js</valueProcess>
- <expose v="true" />
- <mandatory v="true" />
- <description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
- </entityParameter>
- <entityParameter>
- <name>AssignmentName_param</name>
- <valueProcess>%aditoprj%/entity/Document_entity/entityfields/maindocuments/children/assignmentname_param/valueProcess.js</valueProcess>
- <expose v="true" />
- <documentation>%aditoprj%/entity/Document_entity/entityfields/maindocuments/children/assignmentname_param/documentation.adoc</documentation>
- </entityParameter>
- <entityParameter>
- <name>AssignmentRowId_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>AssignmentTable_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>DisallowCreate_param</name>
- <expose v="false" />
- </entityParameter>
- </children>
</entityProvider>
<entityParameter>
<name>DisallowCreate_param</name>
@@ -346,14 +346,6 @@
<entityProvider>
<name>SingleDocument</name>
<titlePlural>Document</titlePlural>
- <dependencies>
- <entityDependency>
- <name>91f87622-d0e8-43c6-99a0-5f9cebf79aaf</name>
- <entityName>SerialLetter_entity</entityName>
- <fieldName>Documents</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>AssignmentName_param</name>
@@ -365,6 +357,14 @@
<expose v="true" />
</entityParameter>
</children>
+ <dependencies>
+ <entityDependency>
+ <name>91f87622-d0e8-43c6-99a0-5f9cebf79aaf</name>
+ <entityName>SerialLetter_entity</entityName>
+ <fieldName>Documents</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
</entityProvider>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
diff --git a/entity/UserhelpResources/UserhelpResources.aod b/entity/UserhelpResources_entity/UserhelpResources_entity.aod
similarity index 70%
rename from entity/UserhelpResources/UserhelpResources.aod
rename to entity/UserhelpResources_entity/UserhelpResources_entity.aod
index 7775d3fd5a..32f253d411 100644
--- a/entity/UserhelpResources/UserhelpResources.aod
+++ b/entity/UserhelpResources_entity/UserhelpResources_entity.aod
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
- <name>UserhelpResources</name>
+ <name>UserhelpResources_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <documentation>%aditoprj%/entity/UserhelpResources/documentation.adoc</documentation>
+ <documentation>%aditoprj%/entity/UserhelpResources_entity/documentation.adoc</documentation>
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
@@ -12,21 +12,21 @@
</entityField>
<entityConsumer>
<name>Documents</name>
- <dependency>
- <name>dependency</name>
- <entityName>Document_entity</entityName>
- <fieldName>Documents</fieldName>
- </dependency>
<children>
<entityParameter>
<name>AssignmentTable_param</name>
- <valueProcess>%aditoprj%/entity/UserhelpResources/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/UserhelpResources_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
</entityParameter>
<entityParameter>
<name>AssignmentRowId_param</name>
- <valueProcess>%aditoprj%/entity/UserhelpResources/entityfields/documents/children/assignmentrowid_param/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/UserhelpResources_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Document_entity</entityName>
+ <fieldName>Documents</fieldName>
+ </dependency>
</entityConsumer>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
diff --git a/entity/UserhelpResources/documentation.adoc b/entity/UserhelpResources_entity/documentation.adoc
similarity index 100%
rename from entity/UserhelpResources/documentation.adoc
rename to entity/UserhelpResources_entity/documentation.adoc
diff --git a/entity/UserhelpResources/entityfields/documents/children/assignmentrowid_param/valueProcess.js b/entity/UserhelpResources_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js
similarity index 100%
rename from entity/UserhelpResources/entityfields/documents/children/assignmentrowid_param/valueProcess.js
rename to entity/UserhelpResources_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js
diff --git a/entity/UserhelpResources/entityfields/documents/children/assignmenttable_param/valueProcess.js b/entity/UserhelpResources_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js
similarity index 100%
rename from entity/UserhelpResources/entityfields/documents/children/assignmenttable_param/valueProcess.js
rename to entity/UserhelpResources_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js
diff --git a/neonContext/Userhelp/Userhelp.aod b/neonContext/Userhelp/Userhelp.aod
index 435de68c2c..057b38dda4 100644
--- a/neonContext/Userhelp/Userhelp.aod
+++ b/neonContext/Userhelp/Userhelp.aod
@@ -3,7 +3,7 @@
<name>Userhelp</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterView>Userhelp_FilterView</filterView>
- <entity>UserhelpResources</entity>
+ <entity>UserhelpResources_entity</entity>
<references>
<neonViewReference>
<name>2a1dd62b-0f30-442b-aa1d-969b46312d2a</name>
--
GitLab