Skip to content
Snippets Groups Projects
Commit 71401e18 authored by Johannes Hörmann's avatar Johannes Hörmann
Browse files

Merge origin/refactor_entity into refactor_entity

parents 5906fed3 ac511481
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 38 additions and 38 deletions
entity/ActivityLink_entity/ActivityLink_entity.aod
+ 1
− 1
View file @ 71401e18
......@@ -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>
......
entity/Activity_entity/Activity_entity.aod
+ 15
− 15
View file @ 71401e18
......@@ -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>
......
entity/Address_entity/Address_entity.aod
+ 1
− 1
View file @ 71401e18
......@@ -92,7 +92,7 @@
<entityDependency>
<name>b484b43c-16f6-4875-9787-f0813dd200cb</name>
<entityName>Org_entity</entityName>
<fieldName>OrgAddresses</fieldName>
<fieldName>Addresses</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
......
entity/Comm_entity/Comm_entity.aod
+ 3
− 3
View file @ 71401e18
......@@ -76,7 +76,7 @@ Usually this is used for filtering COMM-entires by a specified contact or creati
<entityDependency>
<name>070b2457-3766-4c8a-b43f-a2bf7c9ef638</name>
<entityName>Org_entity</entityName>
<fieldName>Comms</fieldName>
<fieldName>Communications</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
......@@ -102,7 +102,7 @@ Usually this is used for filtering COMM-entires by a specified contact or creati
<entityDependency>
<name>7382242a-aa18-4a31-ab77-69a79f2b97b8</name>
<entityName>Org_entity</entityName>
<fieldName>PhoneComms</fieldName>
<fieldName>PhoneCommunications</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
......@@ -115,7 +115,7 @@ Usually this is used for filtering COMM-entires by a specified contact or creati
<entityDependency>
<name>ecfbf518-fe92-4661-8ebe-e2d3c8d259e1</name>
<entityName>Org_entity</entityName>
<fieldName>EmailComms</fieldName>
<fieldName>EmailCommunications</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
......
entity/Document_entity/Document_entity.aod
+ 2
− 2
View file @ 71401e18
......@@ -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>
......
entity/ObjectRelation_entity/ObjectRelation_entity.aod
+ 1
− 1
View file @ 71401e18
......@@ -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>
......
entity/Org_entity/Org_entity.aod
+ 15
− 15
View file @ 71401e18
......@@ -193,7 +193,7 @@
</dependencies>
</entityProvider>
<entityConsumer>
<name>OrgAddresses</name>
<name>Addresses</name>
<title>Addresses</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
......@@ -204,17 +204,17 @@
<children>
<entityParameter>
<name>RelId_param</name>
<code>%aditoprj%/entity/Org_entity/entityfields/orgaddresses/children/relid_param/code.js</code>
<code>%aditoprj%/entity/Org_entity/entityfields/addresses/children/relid_param/code.js</code>
<triggerRecalculation v="true" />
</entityParameter>
<entityParameter>
<name>DefaultAddressId_param</name>
<code>%aditoprj%/entity/Org_entity/entityfields/orgaddresses/children/defaultaddressid_param/code.js</code>
<code>%aditoprj%/entity/Org_entity/entityfields/addresses/children/defaultaddressid_param/code.js</code>
<triggerRecalculation v="true" />
</entityParameter>
<entityParameter>
<name>RelationType_param</name>
<code>%aditoprj%/entity/Org_entity/entityfields/orgaddresses/children/relationtype_param/code.js</code>
<code>%aditoprj%/entity/Org_entity/entityfields/addresses/children/relationtype_param/code.js</code>
<triggerRecalculation v="true" />
</entityParameter>
</children>
......@@ -222,13 +222,13 @@
<entityField>
<name>ADDRESS_ID</name>
<title>standard address</title>
<consumer>OrgAddresses</consumer>
<consumer>Addresses</consumer>
<searchable v="false" />
<state>AUTO</state>
<displayValueProcess>%aditoprj%/entity/Org_entity/entityfields/address_id/displayValueProcess.js</displayValueProcess>
</entityField>
<entityConsumer>
<name>Comms</name>
<name>Communications</name>
<title>Communication</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
......@@ -239,7 +239,7 @@
<children>
<entityParameter>
<name>RelId_param</name>
<code>%aditoprj%/entity/Org_entity/entityfields/comms/children/relid_param/code.js</code>
<code>%aditoprj%/entity/Org_entity/entityfields/communications/children/relid_param/code.js</code>
<triggerRecalculation v="true" />
</entityParameter>
</children>
......@@ -390,7 +390,7 @@
<entityField>
<name>STANDARD_EMAIL_COMM</name>
<title>standard email</title>
<consumer>EmailComms</consumer>
<consumer>EmailCommunications</consumer>
<onValueChange>%aditoprj%/entity/Org_entity/entityfields/standard_email_comm/onValueChange.js</onValueChange>
<onValueChangeTypes>
<element>MASK</element>
......@@ -401,11 +401,11 @@
<entityField>
<name>STANDARD_PHONE_COMM</name>
<title>standard phone</title>
<consumer>PhoneComms</consumer>
<consumer>PhoneCommunications</consumer>
<onValueChange>%aditoprj%/entity/Org_entity/entityfields/standard_phone_comm/onValueChange.js</onValueChange>
</entityField>
<entityConsumer>
<name>PhoneComms</name>
<name>PhoneCommunications</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
......@@ -415,16 +415,16 @@
<children>
<entityParameter>
<name>RelId_param</name>
<code>%aditoprj%/entity/Org_entity/entityfields/phonecomms/children/relid_param/code.js</code>
<code>%aditoprj%/entity/Org_entity/entityfields/phonecommunications/children/relid_param/code.js</code>
</entityParameter>
<entityParameter>
<name>CommCategory_param</name>
<code>%aditoprj%/entity/Org_entity/entityfields/phonecomms/children/commcategory_param/code.js</code>
<code>%aditoprj%/entity/Org_entity/entityfields/phonecommunications/children/commcategory_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
<name>EmailComms</name>
<name>EmailCommunications</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
......@@ -434,11 +434,11 @@
<children>
<entityParameter>
<name>RelId_param</name>
<code>%aditoprj%/entity/Org_entity/entityfields/emailcomms/children/relid_param/code.js</code>
<code>%aditoprj%/entity/Org_entity/entityfields/emailcommunications/children/relid_param/code.js</code>
</entityParameter>
<entityParameter>
<name>CommCategory_param</name>
<code>%aditoprj%/entity/Org_entity/entityfields/emailcomms/children/commcategory_param/code.js</code>
<code>%aditoprj%/entity/Org_entity/entityfields/emailcommunications/children/commcategory_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment