From 716a4d6d7f33ab5f29d6b9c0738f38ce9bd772da Mon Sep 17 00:00:00 2001 From: "j.goderbauer" <j.goderbauer@adito.de> Date: Tue, 12 Feb 2019 15:03:14 +0100 Subject: [PATCH] Relation -> AnyContact --- .../AnyContact_entity.aod} | 22 +++++++++---------- .../contact/children/relationid_param/code.js | 0 .../entityfields/date_edit/valueProcess.js | 0 .../entityfields/date_new/valueProcess.js | 0 .../children/relid_param/code.js | 0 .../entityfields/image/valueProcess.js | 0 .../children/relationid_param/code.js | 0 .../children/relid_param/code.js | 0 .../entityfields/relationtype/valueProcess.js | 0 .../entityfields/user_edit/valueProcess.js | 0 .../entityfields/user_new/valueProcess.js | 0 .../recordcontainers/db/fromClauseProcess.js | 0 .../standard_email_comm.value/expression.js | 0 .../standard_phone_comm.value/expression.js | 0 .../titleProcess.js | 0 .../Communication_entity.aod | 4 ++-- entity/Contract_entity/Contract_entity.aod | 2 +- entity/Offer_entity/Offer_entity.aod | 2 +- entity/Order_entity/Order_entity.aod | 2 +- .../Organisation_entity.aod | 2 +- entity/Person_entity/Person_entity.aod | 2 +- .../AnyContact_context.aod} | 8 +++---- .../AnyContactLookup_view.aod} | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) rename entity/{Relation_entity/Relation_entity.aod => AnyContact_entity/AnyContact_entity.aod} (86%) rename entity/{Relation_entity => AnyContact_entity}/entityfields/contact/children/relationid_param/code.js (100%) rename entity/{Relation_entity => AnyContact_entity}/entityfields/date_edit/valueProcess.js (100%) rename entity/{Relation_entity => AnyContact_entity}/entityfields/date_new/valueProcess.js (100%) rename entity/{Relation_entity => AnyContact_entity}/entityfields/emailcommunications/children/relid_param/code.js (100%) rename entity/{Relation_entity => AnyContact_entity}/entityfields/image/valueProcess.js (100%) rename entity/{Relation_entity => AnyContact_entity}/entityfields/organisation/children/relationid_param/code.js (100%) rename entity/{Relation_entity => AnyContact_entity}/entityfields/phonecommunications/children/relid_param/code.js (100%) rename entity/{Relation_entity => AnyContact_entity}/entityfields/relationtype/valueProcess.js (100%) rename entity/{Relation_entity => AnyContact_entity}/entityfields/user_edit/valueProcess.js (100%) rename entity/{Relation_entity => AnyContact_entity}/entityfields/user_new/valueProcess.js (100%) rename entity/{Relation_entity => AnyContact_entity}/recordcontainers/db/fromClauseProcess.js (100%) rename entity/{Relation_entity => AnyContact_entity}/recordcontainers/db/recordfieldmappings/standard_email_comm.value/expression.js (100%) rename entity/{Relation_entity => AnyContact_entity}/recordcontainers/db/recordfieldmappings/standard_phone_comm.value/expression.js (100%) rename entity/{Relation_entity => AnyContact_entity}/titleProcess.js (100%) rename neonContext/{Relation_context/Relation_context.aod => AnyContact_context/AnyContact_context.aod} (73%) rename neonView/{RelationLookup_view/RelationLookup_view.aod => AnyContactLookup_view/AnyContactLookup_view.aod} (97%) diff --git a/entity/Relation_entity/Relation_entity.aod b/entity/AnyContact_entity/AnyContact_entity.aod similarity index 86% rename from entity/Relation_entity/Relation_entity.aod rename to entity/AnyContact_entity/AnyContact_entity.aod index 1373a088d2d..cf70def0c46 100644 --- a/entity/Relation_entity/Relation_entity.aod +++ b/entity/AnyContact_entity/AnyContact_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.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> - <name>Relation_entity</name> + <name>AnyContact_entity</name> <majorModelMode>DISTRIBUTED</majorModelMode> - <titleProcess>%aditoprj%/entity/Relation_entity/titleProcess.js</titleProcess> + <titleProcess>%aditoprj%/entity/AnyContact_entity/titleProcess.js</titleProcess> <recordContainer>db</recordContainer> <entityFields> <entityProvider> @@ -58,7 +58,7 @@ See RelationUtils.getRelationTypeByPersOrg for possible values</description> <contentType>NUMBER</contentType> <searchable v="false" /> - <valueProcess>%aditoprj%/entity/Relation_entity/entityfields/relationtype/valueProcess.js</valueProcess> + <valueProcess>%aditoprj%/entity/AnyContact_entity/entityfields/relationtype/valueProcess.js</valueProcess> </entityField> <entityConsumer> <name>Contact</name> @@ -71,7 +71,7 @@ See RelationUtils.getRelationTypeByPersOrg for possible values</description> <children> <entityParameter> <name>RelationId_param</name> - <code>%aditoprj%/entity/Relation_entity/entityfields/contact/children/relationid_param/code.js</code> + <code>%aditoprj%/entity/AnyContact_entity/entityfields/contact/children/relationid_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -86,7 +86,7 @@ See RelationUtils.getRelationTypeByPersOrg for possible values</description> <children> <entityParameter> <name>relationId_param</name> - <code>%aditoprj%/entity/Relation_entity/entityfields/organisation/children/relationid_param/code.js</code> + <code>%aditoprj%/entity/AnyContact_entity/entityfields/organisation/children/relationid_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -105,7 +105,7 @@ See RelationUtils.getRelationTypeByPersOrg for possible values</description> <entityField> <name>IMAGE</name> <contentType>IMAGE</contentType> - <valueProcess>%aditoprj%/entity/Relation_entity/entityfields/image/valueProcess.js</valueProcess> + <valueProcess>%aditoprj%/entity/AnyContact_entity/entityfields/image/valueProcess.js</valueProcess> </entityField> <entityConsumer> <name>EmailCommunications</name> @@ -118,7 +118,7 @@ See RelationUtils.getRelationTypeByPersOrg for possible values</description> <children> <entityParameter> <name>RelId_param</name> - <code>%aditoprj%/entity/Relation_entity/entityfields/emailcommunications/children/relid_param/code.js</code> + <code>%aditoprj%/entity/AnyContact_entity/entityfields/emailcommunications/children/relid_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -133,7 +133,7 @@ See RelationUtils.getRelationTypeByPersOrg for possible values</description> <children> <entityParameter> <name>RelId_param</name> - <code>%aditoprj%/entity/Relation_entity/entityfields/phonecommunications/children/relid_param/code.js</code> + <code>%aditoprj%/entity/AnyContact_entity/entityfields/phonecommunications/children/relid_param/code.js</code> </entityParameter> </children> </entityConsumer> @@ -154,7 +154,7 @@ See RelationUtils.getRelationTypeByPersOrg for possible values</description> <dbRecordContainer> <name>db</name> <alias>Data_alias</alias> - <fromClauseProcess>%aditoprj%/entity/Relation_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess> + <fromClauseProcess>%aditoprj%/entity/AnyContact_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess> <linkInformation> <linkInformation> <name>7b3fa460-44a1-40f3-89e3-1625ce9c6bb3</name> @@ -224,11 +224,11 @@ See RelationUtils.getRelationTypeByPersOrg for possible values</description> </dbRecordFieldMapping> <dbRecordFieldMapping> <name>STANDARD_EMAIL_COMMUNICATION.value</name> - <expression>%aditoprj%/entity/Relation_entity/recordcontainers/db/recordfieldmappings/standard_email_communication.value/expression.js</expression> + <expression>%aditoprj%/entity/AnyContact_entity/recordcontainers/db/recordfieldmappings/standard_email_communication.value/expression.js</expression> </dbRecordFieldMapping> <dbRecordFieldMapping> <name>STANDARD_PHONE_COMMUNICATION.value</name> - <expression>%aditoprj%/entity/Relation_entity/recordcontainers/db/recordfieldmappings/standard_phone_communication.value/expression.js</expression> + <expression>%aditoprj%/entity/AnyContact_entity/recordcontainers/db/recordfieldmappings/standard_phone_communication.value/expression.js</expression> </dbRecordFieldMapping> <dbRecordFieldMapping> <name>RELATIONSHIP.value</name> diff --git a/entity/Relation_entity/entityfields/contact/children/relationid_param/code.js b/entity/AnyContact_entity/entityfields/contact/children/relationid_param/code.js similarity index 100% rename from entity/Relation_entity/entityfields/contact/children/relationid_param/code.js rename to entity/AnyContact_entity/entityfields/contact/children/relationid_param/code.js diff --git a/entity/Relation_entity/entityfields/date_edit/valueProcess.js b/entity/AnyContact_entity/entityfields/date_edit/valueProcess.js similarity index 100% rename from entity/Relation_entity/entityfields/date_edit/valueProcess.js rename to entity/AnyContact_entity/entityfields/date_edit/valueProcess.js diff --git a/entity/Relation_entity/entityfields/date_new/valueProcess.js b/entity/AnyContact_entity/entityfields/date_new/valueProcess.js similarity index 100% rename from entity/Relation_entity/entityfields/date_new/valueProcess.js rename to entity/AnyContact_entity/entityfields/date_new/valueProcess.js diff --git a/entity/Relation_entity/entityfields/emailcommunications/children/relid_param/code.js b/entity/AnyContact_entity/entityfields/emailcommunications/children/relid_param/code.js similarity index 100% rename from entity/Relation_entity/entityfields/emailcommunications/children/relid_param/code.js rename to entity/AnyContact_entity/entityfields/emailcommunications/children/relid_param/code.js diff --git a/entity/Relation_entity/entityfields/image/valueProcess.js b/entity/AnyContact_entity/entityfields/image/valueProcess.js similarity index 100% rename from entity/Relation_entity/entityfields/image/valueProcess.js rename to entity/AnyContact_entity/entityfields/image/valueProcess.js diff --git a/entity/Relation_entity/entityfields/organisation/children/relationid_param/code.js b/entity/AnyContact_entity/entityfields/organisation/children/relationid_param/code.js similarity index 100% rename from entity/Relation_entity/entityfields/organisation/children/relationid_param/code.js rename to entity/AnyContact_entity/entityfields/organisation/children/relationid_param/code.js diff --git a/entity/Relation_entity/entityfields/phonecommunications/children/relid_param/code.js b/entity/AnyContact_entity/entityfields/phonecommunications/children/relid_param/code.js similarity index 100% rename from entity/Relation_entity/entityfields/phonecommunications/children/relid_param/code.js rename to entity/AnyContact_entity/entityfields/phonecommunications/children/relid_param/code.js diff --git a/entity/Relation_entity/entityfields/relationtype/valueProcess.js b/entity/AnyContact_entity/entityfields/relationtype/valueProcess.js similarity index 100% rename from entity/Relation_entity/entityfields/relationtype/valueProcess.js rename to entity/AnyContact_entity/entityfields/relationtype/valueProcess.js diff --git a/entity/Relation_entity/entityfields/user_edit/valueProcess.js b/entity/AnyContact_entity/entityfields/user_edit/valueProcess.js similarity index 100% rename from entity/Relation_entity/entityfields/user_edit/valueProcess.js rename to entity/AnyContact_entity/entityfields/user_edit/valueProcess.js diff --git a/entity/Relation_entity/entityfields/user_new/valueProcess.js b/entity/AnyContact_entity/entityfields/user_new/valueProcess.js similarity index 100% rename from entity/Relation_entity/entityfields/user_new/valueProcess.js rename to entity/AnyContact_entity/entityfields/user_new/valueProcess.js diff --git a/entity/Relation_entity/recordcontainers/db/fromClauseProcess.js b/entity/AnyContact_entity/recordcontainers/db/fromClauseProcess.js similarity index 100% rename from entity/Relation_entity/recordcontainers/db/fromClauseProcess.js rename to entity/AnyContact_entity/recordcontainers/db/fromClauseProcess.js diff --git a/entity/Relation_entity/recordcontainers/db/recordfieldmappings/standard_email_comm.value/expression.js b/entity/AnyContact_entity/recordcontainers/db/recordfieldmappings/standard_email_comm.value/expression.js similarity index 100% rename from entity/Relation_entity/recordcontainers/db/recordfieldmappings/standard_email_comm.value/expression.js rename to entity/AnyContact_entity/recordcontainers/db/recordfieldmappings/standard_email_comm.value/expression.js diff --git a/entity/Relation_entity/recordcontainers/db/recordfieldmappings/standard_phone_comm.value/expression.js b/entity/AnyContact_entity/recordcontainers/db/recordfieldmappings/standard_phone_comm.value/expression.js similarity index 100% rename from entity/Relation_entity/recordcontainers/db/recordfieldmappings/standard_phone_comm.value/expression.js rename to entity/AnyContact_entity/recordcontainers/db/recordfieldmappings/standard_phone_comm.value/expression.js diff --git a/entity/Relation_entity/titleProcess.js b/entity/AnyContact_entity/titleProcess.js similarity index 100% rename from entity/Relation_entity/titleProcess.js rename to entity/AnyContact_entity/titleProcess.js diff --git a/entity/Communication_entity/Communication_entity.aod b/entity/Communication_entity/Communication_entity.aod index e0ce8931335..8d4c2d12bf3 100644 --- a/entity/Communication_entity/Communication_entity.aod +++ b/entity/Communication_entity/Communication_entity.aod @@ -97,7 +97,7 @@ Usually this is used for filtering COMMUNICATION-entires by a specified contact </entityDependency> <entityDependency> <name>ddcd3c3d-f305-4ced-a8ac-ffb510474aa4</name> - <entityName>Relation_entity</entityName> + <entityName>AnyContact_entity</entityName> <fieldName>PhoneCommunications</fieldName> <isConsumer v="false" /> </entityDependency> @@ -130,7 +130,7 @@ Usually this is used for filtering COMMUNICATION-entires by a specified contact </entityDependency> <entityDependency> <name>c6e2631a-896f-4689-b254-0091ed25f705</name> - <entityName>Relation_entity</entityName> + <entityName>AnyContact_entity</entityName> <fieldName>EmailCommunications</fieldName> <isConsumer v="false" /> </entityDependency> diff --git a/entity/Contract_entity/Contract_entity.aod b/entity/Contract_entity/Contract_entity.aod index 1b149c7c5a1..b792b695677 100644 --- a/entity/Contract_entity/Contract_entity.aod +++ b/entity/Contract_entity/Contract_entity.aod @@ -137,7 +137,7 @@ <fieldType>DEPENDENCY_OUT</fieldType> <dependency> <name>dependency</name> - <entityName>Relation_entity</entityName> + <entityName>AnyContact_entity</entityName> <fieldName>#PROVIDER</fieldName> </dependency> </entityConsumer> diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod index bb0d32352a2..5a5a1dd15eb 100644 --- a/entity/Offer_entity/Offer_entity.aod +++ b/entity/Offer_entity/Offer_entity.aod @@ -237,7 +237,7 @@ <fieldType>DEPENDENCY_OUT</fieldType> <dependency> <name>dependency</name> - <entityName>Relation_entity</entityName> + <entityName>AnyContact_entity</entityName> <fieldName>#PROVIDER</fieldName> </dependency> </entityConsumer> diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod index 26a91f51023..53e941c12d4 100644 --- a/entity/Order_entity/Order_entity.aod +++ b/entity/Order_entity/Order_entity.aod @@ -218,7 +218,7 @@ <fieldType>DEPENDENCY_OUT</fieldType> <dependency> <name>dependency</name> - <entityName>Relation_entity</entityName> + <entityName>AnyContact_entity</entityName> <fieldName>#PROVIDER</fieldName> </dependency> </entityConsumer> diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod index 0e923128882..a0ff470c621 100644 --- a/entity/Organisation_entity/Organisation_entity.aod +++ b/entity/Organisation_entity/Organisation_entity.aod @@ -119,7 +119,7 @@ <dependencies> <entityDependency> <name>e56d51be-aaf7-4ddc-8bed-7a4a3c42b4dd</name> - <entityName>Relation_entity</entityName> + <entityName>AnyContact_entity</entityName> <fieldName>Organisation</fieldName> <isConsumer v="false" /> </entityDependency> diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod index 09aa53b49e1..26cb29c37ef 100644 --- a/entity/Person_entity/Person_entity.aod +++ b/entity/Person_entity/Person_entity.aod @@ -313,7 +313,7 @@ <dependencies> <entityDependency> <name>0b209ee1-3c13-4660-91c4-4d2a2c6cea77</name> - <entityName>Relation_entity</entityName> + <entityName>AnyContact_entity</entityName> <fieldName>Contact</fieldName> <isConsumer v="false" /> </entityDependency> diff --git a/neonContext/Relation_context/Relation_context.aod b/neonContext/AnyContact_context/AnyContact_context.aod similarity index 73% rename from neonContext/Relation_context/Relation_context.aod rename to neonContext/AnyContact_context/AnyContact_context.aod index 3362a708b4a..333ed113206 100644 --- a/neonContext/Relation_context/Relation_context.aod +++ b/neonContext/AnyContact_context/AnyContact_context.aod @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0"> - <name>Relation_context</name> + <name>AnyContact_context</name> <majorModelMode>DISTRIBUTED</majorModelMode> - <lookupview>RelationLookup_view</lookupview> - <entity>Relation_entity</entity> + <lookupview>AnyContactLookup_view</lookupview> + <entity>AnyContact_entity</entity> <references> <neonViewReference> <name>1ea0b1ed-c2b5-4b8c-b359-27ffdef6e5ea</name> - <view>RelationLookup_view</view> + <view>AnyContactLookup_view</view> </neonViewReference> </references> </neonContext> diff --git a/neonView/RelationLookup_view/RelationLookup_view.aod b/neonView/AnyContactLookup_view/AnyContactLookup_view.aod similarity index 97% rename from neonView/RelationLookup_view/RelationLookup_view.aod rename to neonView/AnyContactLookup_view/AnyContactLookup_view.aod index 23e38d3fd7e..efe003fffa8 100644 --- a/neonView/RelationLookup_view/RelationLookup_view.aod +++ b/neonView/AnyContactLookup_view/AnyContactLookup_view.aod @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1"> - <name>RelationLookup_view</name> + <name>AnyContactLookup_view</name> <majorModelMode>DISTRIBUTED</majorModelMode> <layout> <boxLayout> -- GitLab