From a622163a11b2345a0119893f859d73934be7bc60 Mon Sep 17 00:00:00 2001 From: Tobias Feldmann <t.feldmann@adito.de> Date: Thu, 22 Nov 2018 13:19:09 +0100 Subject: [PATCH] Caption -> Title for Org_entity --- entity/Org_entity/Org_entity.aod | 28 +++++++++---------- .../{captionProcess.js => titleProcess.js} | 0 2 files changed, 13 insertions(+), 15 deletions(-) rename entity/Org_entity/{captionProcess.js => titleProcess.js} (100%) diff --git a/entity/Org_entity/Org_entity.aod b/entity/Org_entity/Org_entity.aod index b8cd216f807..a8890c00fe8 100644 --- a/entity/Org_entity/Org_entity.aod +++ b/entity/Org_entity/Org_entity.aod @@ -4,18 +4,17 @@ <title>Company</title> <majorModelMode>DISTRIBUTED</majorModelMode> <recordContainerType>DB</recordContainerType> - <caption>Company</caption> - <captionProcess>%aditoprj%/entity/Org_entity/captionProcess.js</captionProcess> <iconId>VAADIN:BUILDING</iconId> <imageProcess>%aditoprj%/entity/Org_entity/imageProcess.js</imageProcess> + <titleProcess>%aditoprj%/entity/Org_entity/titleProcess.js</titleProcess> <alias>Data_alias</alias> <fromClauseProcess>%aditoprj%/entity/Org_entity/fromClauseProcess.js</fromClauseProcess> <entityFields> <entityField> <name>CUSTOMERCODE</name> + <title>Customercode</title> <tableName>ORG</tableName> <columnName>CUSTOMERCODE</columnName> - <caption>Customercode</caption> <contentType>TEXT</contentType> </entityField> <entityField> @@ -41,16 +40,16 @@ </entityField> <entityField> <name>INFO</name> + <title>Information</title> <tableName>ORG</tableName> <columnName>INFO</columnName> - <caption>Information</caption> <contentType>LONG_TEXT</contentType> </entityField> <entityField> <name>NAME</name> + <title>Name</title> <tableName>ORG</tableName> <columnName>NAME</columnName> - <caption>Name</caption> <mandatory v="true" /> </entityField> <entityField> @@ -91,9 +90,9 @@ </entityField> <entityField> <name>LANGUAGE</name> + <title>Language</title> <tableName>RELATION</tableName> <columnName>LANGUAGE</columnName> - <caption>Language</caption> <possibleItemsProcess>%aditoprj%/entity/Org_entity/entityfields/language/possibleItemsProcess.js</possibleItemsProcess> <selectionMode>SINGLE</selectionMode> </entityField> @@ -110,9 +109,9 @@ </entityField> <entityField> <name>STATUS</name> + <title>Status</title> <tableName>RELATION</tableName> <columnName>STATUS</columnName> - <caption>Status</caption> <contentType>TEXT</contentType> <possibleItemsProcess>%aditoprj%/entity/Org_entity/entityfields/status/possibleItemsProcess.js</possibleItemsProcess> <searchable v="false" /> @@ -132,9 +131,9 @@ </entityField> <entityField> <name>TYPE</name> + <title>Type</title> <tableName>ORG</tableName> <columnName>TYPE</columnName> - <caption>Type</caption> <possibleItemsProcess>%aditoprj%/entity/Org_entity/entityfields/type/possibleItemsProcess.js</possibleItemsProcess> <searchable v="false" /> </entityField> @@ -168,6 +167,7 @@ <entityParameter> <name>OrgId_param</name> <code>%aditoprj%/entity/Org_entity/entityfields/persorg_dfo/children/orgid_param/code.js</code> + <triggerRecalculation v="true" /> </entityParameter> </children> </entityOutgoingField> @@ -218,7 +218,6 @@ <name>OrgAddress_dfo</name> <title>Addresses</title> <fieldType>DEPENDENCY_OUT</fieldType> - <caption>Addresses</caption> <dependency> <name>dependency</name> <entityName>Address_entity</entityName> @@ -246,7 +245,6 @@ <name>OrgComm_dfo</name> <title>Communication</title> <fieldType>DEPENDENCY_OUT</fieldType> - <caption>Communication</caption> <dependency> <name>dependency</name> <entityName>Comm_entity</entityName> @@ -262,8 +260,8 @@ </entityOutgoingField> <entityOutgoingField> <name>OrgCommEmail_dfo</name> + <title>Communication E-Mail</title> <fieldType>DEPENDENCY_OUT</fieldType> - <caption>Communication E-Mail</caption> <dependency> <name>dependency</name> <entityName>Comm_entity</entityName> @@ -284,8 +282,8 @@ </entityOutgoingField> <entityOutgoingField> <name>OrgCommPhone_dfo</name> + <title>Communication Phone</title> <fieldType>DEPENDENCY_OUT</fieldType> - <caption>Communication Phone</caption> <dependency> <name>dependency</name> <entityName>Comm_entity</entityName> @@ -306,8 +304,8 @@ </entityOutgoingField> <entityOutgoingField> <name>OrgCommOthers_dfo</name> + <title>Communication Other</title> <fieldType>DEPENDENCY_OUT</fieldType> - <caption>Communication Other</caption> <dependency> <name>dependency</name> <entityName>Comm_entity</entityName> @@ -328,6 +326,7 @@ </entityOutgoingField> <entityOutgoingField> <name>OrgContract_dfo</name> + <title>Contracts</title> <fieldType>DEPENDENCY_OUT</fieldType> <dependency> <name>dependency</name> @@ -361,7 +360,6 @@ <name>OrgProductprice_dfo</name> <title>Conditions</title> <fieldType>DEPENDENCY_OUT</fieldType> - <caption>Conditions</caption> <dependency> <name>dependency</name> <entityName>Productprice_entity</entityName> @@ -379,7 +377,7 @@ </entityIncomingField> <entityOutgoingField> <name>OrgDocument_dfo</name> - <title>Dokumente</title> + <title>Documents</title> <fieldType>DEPENDENCY_OUT</fieldType> <dependency> <name>dependency</name> diff --git a/entity/Org_entity/captionProcess.js b/entity/Org_entity/titleProcess.js similarity index 100% rename from entity/Org_entity/captionProcess.js rename to entity/Org_entity/titleProcess.js -- GitLab