From ead7e6dc3d31491629c36be50a6415c1f63dd32a Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Fri, 29 Mar 2019 14:20:30 +0100
Subject: [PATCH] several titles changed
---
.../ActivityLink_entity.aod | 4 +-
.../AppointmentLink_entity.aod | 266 +++++++++---------
entity/TaskLink_entity/TaskLink_entity.aod | 4 +-
.../_____LANGUAGE_EXTRA.aod | 6 +
.../_____LANGUAGE_de/_____LANGUAGE_de.aod | 9 +
.../_____LANGUAGE_en/_____LANGUAGE_en.aod | 8 +
6 files changed, 161 insertions(+), 136 deletions(-)
diff --git a/entity/ActivityLink_entity/ActivityLink_entity.aod b/entity/ActivityLink_entity/ActivityLink_entity.aod
index f717d43107..be69dcabe1 100644
--- a/entity/ActivityLink_entity/ActivityLink_entity.aod
+++ b/entity/ActivityLink_entity/ActivityLink_entity.aod
@@ -14,13 +14,13 @@
</entityField>
<entityField>
<name>OBJECT_TYPE</name>
- <title>Object type</title>
+ <title>{$OBJECTLINK_TYPE}</title>
<consumer>Context</consumer>
<displayValueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/object_type/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>OBJECT_ROWID</name>
- <title>Relation</title>
+ <title>{$OBJECTLINK_OBJECT}</title>
<consumer>Objects</consumer>
<linkedContextProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/object_rowid/linkedContextProcess.js</linkedContextProcess>
<displayValueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/object_rowid/displayValueProcess.js</displayValueProcess>
diff --git a/entity/AppointmentLink_entity/AppointmentLink_entity.aod b/entity/AppointmentLink_entity/AppointmentLink_entity.aod
index 85253e1444..3aa241d80f 100644
--- a/entity/AppointmentLink_entity/AppointmentLink_entity.aod
+++ b/entity/AppointmentLink_entity/AppointmentLink_entity.aod
@@ -1,132 +1,134 @@
-<?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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
- <name>AppointmentLink_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <recordContainer>db</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- <recordContainer>db</recordContainer>
- </entityProvider>
- <entityField>
- <name>AB_APPOINTMENTLINKID</name>
- <valueProcess>%aditoprj%/entity/AppointmentLink_entity/entityfields/ab_appointmentlinkid/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>APPOINTMENT_ID</name>
- <valueProcess>%aditoprj%/entity/AppointmentLink_entity/entityfields/appointment_id/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>OBJECTID</name>
- <consumer>Objects</consumer>
- <linkedContext>Object</linkedContext>
- <displayValueProcess>%aditoprj%/entity/AppointmentLink_entity/entityfields/objectid/displayValueProcess.js</displayValueProcess>
- <onValueChangeTypes>
- <element>MASK</element>
- <element>PROCESS</element>
- </onValueChangeTypes>
- </entityField>
- <entityField>
- <name>OBJECTTYPE</name>
- <consumer>Context</consumer>
- <linkedContext>Context</linkedContext>
- <displayValueProcess>%aditoprj%/entity/AppointmentLink_entity/entityfields/objecttype/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityParameter>
- <name>AppointmentId_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityProvider>
- <name>Links</name>
- <fieldType>DEPENDENCY_IN</fieldType>
- <targetContextField>OBJECTTYPE</targetContextField>
- <targetIdField>OBJECTID</targetIdField>
- <recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>3dde1745-18a1-4499-83d0-61e414086997</name>
- <entityName>Appointment_entity</entityName>
- <fieldName>AppointmentLinks</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>AppointmentId_param</name>
- <expose v="true" />
- <triggerRecalculation v="true" />
- </entityParameter>
- </children>
- </entityProvider>
- <entityConsumer>
- <name>Context</name>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>Context_entity</entityName>
- <fieldName>#PROVIDER</fieldName>
- </dependency>
- </entityConsumer>
- <entityConsumer>
- <name>Objects</name>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>Object_entity</entityName>
- <fieldName>AllObjects</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ObjectType_param</name>
- <valueProcess>%aditoprj%/entity/AppointmentLink_entity/entityfields/objects/children/objecttype_param/valueProcess.js</valueProcess>
- <expose v="true" />
- <triggerRecalculation v="true" />
- </entityParameter>
- </children>
- </entityConsumer>
- <entityActionField>
- <name>opencontext</name>
- <fieldType>ACTION</fieldType>
- <onActionProcess>%aditoprj%/entity/AppointmentLink_entity/entityfields/opencontext/onActionProcess.js</onActionProcess>
- </entityActionField>
- </entityFields>
- <recordContainers>
- <dbRecordContainer>
- <name>db</name>
- <alias>Data_alias</alias>
- <conditionProcess>%aditoprj%/entity/AppointmentLink_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <linkInformation>
- <linkInformation>
- <name>211047ab-be9d-401b-a2d9-3dd1e048c5c5</name>
- <tableName>AB_APPOINTMENTLINK</tableName>
- <primaryKey>AB_APPOINTMENTLINK_ID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
- <recordFieldMappings>
- <dbRecordFieldMapping>
- <name>APPOINTMENT_ID.value</name>
- <recordfield>AB_APPOINTMENTLINK.APPOINTMENT_ID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>OBJECTID.value</name>
- <recordfield>AB_APPOINTMENTLINK.OBJECT_ROWID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>OBJECTTYPE.value</name>
- <recordfield>AB_APPOINTMENTLINK.OBJECT_TYPE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>OBJECTID.displayValue</name>
- <expression>%aditoprj%/entity/AppointmentLink_entity/recordcontainers/db/recordfieldmappings/objectid.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>AB_APPOINTMENTLINKID.value</name>
- <recordfield>AB_APPOINTMENTLINK.AB_APPOINTMENTLINK_ID</recordfield>
- </dbRecordFieldMapping>
- </recordFieldMappings>
- </dbRecordContainer>
- </recordContainers>
-</entity>
+<?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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+ <name>AppointmentLink_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <recordContainer>db</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ <recordContainer>db</recordContainer>
+ </entityProvider>
+ <entityField>
+ <name>AB_APPOINTMENTLINKID</name>
+ <valueProcess>%aditoprj%/entity/AppointmentLink_entity/entityfields/ab_appointmentlinkid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>APPOINTMENT_ID</name>
+ <valueProcess>%aditoprj%/entity/AppointmentLink_entity/entityfields/appointment_id/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>OBJECTID</name>
+ <title>{$OBJECTLINK_OBJECT}</title>
+ <consumer>Objects</consumer>
+ <linkedContext>Object</linkedContext>
+ <displayValueProcess>%aditoprj%/entity/AppointmentLink_entity/entityfields/objectid/displayValueProcess.js</displayValueProcess>
+ <onValueChangeTypes>
+ <element>MASK</element>
+ <element>PROCESS</element>
+ </onValueChangeTypes>
+ </entityField>
+ <entityField>
+ <name>OBJECTTYPE</name>
+ <title>{$OBJECTLINK_TYPE}</title>
+ <consumer>Context</consumer>
+ <linkedContext>Context</linkedContext>
+ <displayValueProcess>%aditoprj%/entity/AppointmentLink_entity/entityfields/objecttype/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityParameter>
+ <name>AppointmentId_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityProvider>
+ <name>Links</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <targetContextField>OBJECTTYPE</targetContextField>
+ <targetIdField>OBJECTID</targetIdField>
+ <recordContainer>db</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>3dde1745-18a1-4499-83d0-61e414086997</name>
+ <entityName>Appointment_entity</entityName>
+ <fieldName>AppointmentLinks</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>AppointmentId_param</name>
+ <expose v="true" />
+ <triggerRecalculation v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityConsumer>
+ <name>Context</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Context_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Objects</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Object_entity</entityName>
+ <fieldName>AllObjects</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <valueProcess>%aditoprj%/entity/AppointmentLink_entity/entityfields/objects/children/objecttype_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ <triggerRecalculation v="true" />
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityActionField>
+ <name>opencontext</name>
+ <fieldType>ACTION</fieldType>
+ <onActionProcess>%aditoprj%/entity/AppointmentLink_entity/entityfields/opencontext/onActionProcess.js</onActionProcess>
+ </entityActionField>
+ </entityFields>
+ <recordContainers>
+ <dbRecordContainer>
+ <name>db</name>
+ <alias>Data_alias</alias>
+ <conditionProcess>%aditoprj%/entity/AppointmentLink_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <linkInformation>
+ <linkInformation>
+ <name>211047ab-be9d-401b-a2d9-3dd1e048c5c5</name>
+ <tableName>AB_APPOINTMENTLINK</tableName>
+ <primaryKey>AB_APPOINTMENTLINK_ID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
+ <recordFieldMappings>
+ <dbRecordFieldMapping>
+ <name>APPOINTMENT_ID.value</name>
+ <recordfield>AB_APPOINTMENTLINK.APPOINTMENT_ID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>OBJECTID.value</name>
+ <recordfield>AB_APPOINTMENTLINK.OBJECT_ROWID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>OBJECTTYPE.value</name>
+ <recordfield>AB_APPOINTMENTLINK.OBJECT_TYPE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>OBJECTID.displayValue</name>
+ <expression>%aditoprj%/entity/AppointmentLink_entity/recordcontainers/db/recordfieldmappings/objectid.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>AB_APPOINTMENTLINKID.value</name>
+ <recordfield>AB_APPOINTMENTLINK.AB_APPOINTMENTLINK_ID</recordfield>
+ </dbRecordFieldMapping>
+ </recordFieldMappings>
+ </dbRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/TaskLink_entity/TaskLink_entity.aod b/entity/TaskLink_entity/TaskLink_entity.aod
index 2ed05178f4..8074c19d87 100644
--- a/entity/TaskLink_entity/TaskLink_entity.aod
+++ b/entity/TaskLink_entity/TaskLink_entity.aod
@@ -17,13 +17,13 @@
</entityField>
<entityField>
<name>OBJECT_TYPE</name>
- <title>Object type</title>
+ <title>{$OBJECTLINK_TYPE}</title>
<consumer>Contexts</consumer>
<displayValueProcess>%aditoprj%/entity/TaskLink_entity/entityfields/object_type/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>OBJECT_ROWID</name>
- <title>Relation</title>
+ <title>{$OBJECTLINK_OBJECT}</title>
<consumer>Objects</consumer>
<linkedContextProcess>%aditoprj%/entity/TaskLink_entity/entityfields/object_rowid/linkedContextProcess.js</linkedContextProcess>
<displayValueProcess>%aditoprj%/entity/TaskLink_entity/entityfields/object_rowid/displayValueProcess.js</displayValueProcess>
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 359b4928d6..a0f27879af 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -2667,6 +2667,12 @@
<entry>
<key>test</key>
</entry>
+ <entry>
+ <key>{$OBJECTLINK_TYPE}</key>
+ </entry>
+ <entry>
+ <key>{$OBJECTLINK_OBJECT}</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
<sqlModels>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 117cb1cda8..3644aa55f8 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -168,6 +168,7 @@
</entry>
<entry>
<key>[%0]the given keyword \"%1\" has no match with the possible keywordlist</key>
+ <value></value>
</entry>
<entry>
<key>360 Degree</key>
@@ -3429,6 +3430,14 @@
<entry>
<key>test</key>
</entry>
+ <entry>
+ <key>{$OBJECTLINK_TYPE}</key>
+ <value>Art</value>
+ </entry>
+ <entry>
+ <key>{$OBJECTLINK_OBJECT}</key>
+ <value>Objekt</value>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index bde30ca07a..4c8ee3cf90 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -2695,6 +2695,14 @@
<entry>
<key>test</key>
</entry>
+ <entry>
+ <key>{$OBJECTLINK_TYPE}</key>
+ <value>Type</value>
+ </entry>
+ <entry>
+ <key>{$OBJECTLINK_OBJECT}</key>
+ <value>Object</value>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
--
GitLab