From 2aa2b6145926f542f3e5beaf2fd031a7a148283d Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Tue, 16 Apr 2019 09:58:08 +0200
Subject: [PATCH] activity: rename CREATOR to RESPONSIBLE
---
...activity_rename_Creator_to_Responsible.xml | 9 ++++
.../Data_alias/basic/2019.2/changelog.xml | 2 +
aliasDefinition/Data_alias/Data_alias.aod | 42 +++++++------------
entity/Activity_entity/Activity_entity.aod | 24 +++++------
.../displayValueProcess.js | 0
.../{creator => responsible}/valueProcess.js | 0
.../recordcontainers/db/conditionProcess.js | 2 +-
.../creator.displayvalue/expression.js | 4 --
.../responsible.displayvalue/expression.js | 4 ++
.../_____LANGUAGE_EXTRA.aod | 18 ++++++++
.../_____LANGUAGE_de/_____LANGUAGE_de.aod | 19 +++++++++
.../_____LANGUAGE_en/_____LANGUAGE_en.aod | 18 ++++++++
.../ActivityEdit_view/ActivityEdit_view.aod | 2 +-
.../ActivityPreview_view.aod | 2 +-
14 files changed, 99 insertions(+), 47 deletions(-)
create mode 100644 .liquibase/Data_alias/basic/2019.2/activity_rename_Creator_to_Responsible.xml
rename entity/Activity_entity/entityfields/{creator => responsible}/displayValueProcess.js (100%)
rename entity/Activity_entity/entityfields/{creator => responsible}/valueProcess.js (100%)
delete mode 100644 entity/Activity_entity/recordcontainers/db/recordfieldmappings/creator.displayvalue/expression.js
create mode 100644 entity/Activity_entity/recordcontainers/db/recordfieldmappings/responsible.displayvalue/expression.js
diff --git a/.liquibase/Data_alias/basic/2019.2/activity_rename_Creator_to_Responsible.xml b/.liquibase/Data_alias/basic/2019.2/activity_rename_Creator_to_Responsible.xml
new file mode 100644
index 00000000000..9892f159854
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2019.2/activity_rename_Creator_to_Responsible.xml
@@ -0,0 +1,9 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="j.hoermann" id="5e48c1ac-ceb1-4b93-90b1-900a3c68351d">
+ <renameColumn tableName="ACTIVITY" oldColumnName="CREATOR" newColumnName="RESPONSIBLE"/>
+ <rollback>
+ <renameColumn tableName="ACTIVITY" oldColumnName="RESPONSIBLE" newColumnName="CREATOR"/>
+ </rollback>
+ </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2019.2/changelog.xml b/.liquibase/Data_alias/basic/2019.2/changelog.xml
index 353aa77a0e7..17c4d2d7674 100644
--- a/.liquibase/Data_alias/basic/2019.2/changelog.xml
+++ b/.liquibase/Data_alias/basic/2019.2/changelog.xml
@@ -146,4 +146,6 @@
<include relativeToChangelogFile="true" file="data/example_person/PERSON_admin.xml" context="example"/>
<include relativeToChangelogFile="true" file="addDefaultAddresses.xml" context="example"/>
+
+ <include relativeToChangelogFile="true" file="activity_rename_Creator_to_Responsible.xml" />
</databaseChangeLog>
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index a1158862b25..df8242e2765 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -3346,20 +3346,6 @@
<title></title>
<description></description>
</entityFieldDb>
- <entityFieldDb>
- <name>CREATOR</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="50" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
<entityFieldDb>
<name>PARENT_CONTEXT</name>
<dbName></dbName>
@@ -3444,6 +3430,20 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>RESPONSIBLE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
@@ -4426,20 +4426,6 @@
<title></title>
<description></description>
</entityFieldDb>
- <entityFieldDb>
- <name>ATTRIBUTE_LEVEL</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="4" />
- <size v="10" />
- <scale v="0" />
- <notNull v="true" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
<entityFieldDb>
<name>KEYWORD_CONTAINER</name>
<dbName></dbName>
diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index cd65065c386..60c021ac7ba 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -260,13 +260,13 @@
</children>
</entityProvider>
<entityField>
- <name>CREATOR</name>
- <title>Creator</title>
+ <name>RESPONSIBLE</name>
+ <title>Responsible</title>
<consumer>Employees</consumer>
<linkedContext>Person</linkedContext>
<searchable v="false" />
- <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/creator/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/Activity_entity/entityfields/creator/displayValueProcess.js</displayValueProcess>
+ <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/responsible/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/Activity_entity/entityfields/responsible/displayValueProcess.js</displayValueProcess>
</entityField>
<entityConsumer>
<name>ModuleTrees</name>
@@ -478,10 +478,6 @@
<name>DIRECTION.displayValue</name>
<expression>%aditoprj%/entity/Activity_entity/recordcontainers/db/recordfieldmappings/direction.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CREATOR.value</name>
- <recordfield>ACTIVITY.CREATOR</recordfield>
- </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PARENT_CONTEXT.value</name>
<recordfield>ACTIVITY.PARENT_CONTEXT</recordfield>
@@ -494,10 +490,6 @@
<name>CATEGORY.displayValue</name>
<expression>%aditoprj%/entity/Activity_entity/recordcontainers/db/recordfieldmappings/category.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CREATOR.displayValue</name>
- <expression>%aditoprj%/entity/Activity_entity/recordcontainers/db/recordfieldmappings/creator.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>USER_NEW.value</name>
<recordfield>ACTIVITY.USER_NEW</recordfield>
@@ -514,6 +506,14 @@
<name>DATE_EDIT.value</name>
<recordfield>ACTIVITY.DATE_EDIT</recordfield>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>RESPONSIBLE.displayValue</name>
+ <expression>%aditoprj%/entity/Activity_entity/recordcontainers/db/recordfieldmappings/responsible.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>RESPONSIBLE.value</name>
+ <recordfield>ACTIVITY.RESPONSIBLE</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/Activity_entity/entityfields/creator/displayValueProcess.js b/entity/Activity_entity/entityfields/responsible/displayValueProcess.js
similarity index 100%
rename from entity/Activity_entity/entityfields/creator/displayValueProcess.js
rename to entity/Activity_entity/entityfields/responsible/displayValueProcess.js
diff --git a/entity/Activity_entity/entityfields/creator/valueProcess.js b/entity/Activity_entity/entityfields/responsible/valueProcess.js
similarity index 100%
rename from entity/Activity_entity/entityfields/creator/valueProcess.js
rename to entity/Activity_entity/entityfields/responsible/valueProcess.js
diff --git a/entity/Activity_entity/recordcontainers/db/conditionProcess.js b/entity/Activity_entity/recordcontainers/db/conditionProcess.js
index c772668cbde..9e14d0b2ef2 100644
--- a/entity/Activity_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Activity_entity/recordcontainers/db/conditionProcess.js
@@ -23,7 +23,7 @@ if (vars.exists("$param.RowId_param") && vars.get("$param.RowId_param") && vars.
}
if(vars.exists("$param.OnlyInnate_param") && vars.get("$param.OnlyInnate_param")) {
- cond.andPrepare("ACTIVITY.CREATOR", vars.get("$sys.user"));
+ cond.andPrepare("ACTIVITY.RESPONSIBLE", vars.get("$sys.user"));
}
//TODO: use a preparedCondition when available #1030812 #1034026
diff --git a/entity/Activity_entity/recordcontainers/db/recordfieldmappings/creator.displayvalue/expression.js b/entity/Activity_entity/recordcontainers/db/recordfieldmappings/creator.displayvalue/expression.js
deleted file mode 100644
index 411a003b919..00000000000
--- a/entity/Activity_entity/recordcontainers/db/recordfieldmappings/creator.displayvalue/expression.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("Person_lib");
-
-result.string(PersUtils.getResolvingDisplaySubSql("CREATOR"))
\ No newline at end of file
diff --git a/entity/Activity_entity/recordcontainers/db/recordfieldmappings/responsible.displayvalue/expression.js b/entity/Activity_entity/recordcontainers/db/recordfieldmappings/responsible.displayvalue/expression.js
new file mode 100644
index 00000000000..fdec89201f8
--- /dev/null
+++ b/entity/Activity_entity/recordcontainers/db/recordfieldmappings/responsible.displayvalue/expression.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Person_lib");
+
+result.string(PersUtils.getResolvingDisplaySubSql("RESPONSIBLE"))
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index c3ee7d877f3..cccebb731a2 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -2865,6 +2865,24 @@
<entry>
<key>This cannot be undone!</key>
</entry>
+ <entry>
+ <key>[%0]the tableName is not a string after interpreting</key>
+ </entry>
+ <entry>
+ <key>[%0]%1 has to be a string or array but it is %2</key>
+ </entry>
+ <entry>
+ <key>[%0]has now an incorrect length; estimated 2 elements but got %1</key>
+ </entry>
+ <entry>
+ <key>[%0]the columnName is not a string after interpreting</key>
+ </entry>
+ <entry>
+ <key>[%0]%1 is an object but seems not to be a valid array or array-like</key>
+ </entry>
+ <entry>
+ <key>Responsible</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 c50f65492bc..5957468ab00 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -3676,6 +3676,25 @@
<entry>
<key>Would you like to clear the forecast and set the state to \"%0\"?</key>
</entry>
+ <entry>
+ <key>[%0]the tableName is not a string after interpreting</key>
+ </entry>
+ <entry>
+ <key>[%0]%1 has to be a string or array but it is %2</key>
+ </entry>
+ <entry>
+ <key>[%0]has now an incorrect length; estimated 2 elements but got %1</key>
+ </entry>
+ <entry>
+ <key>[%0]the columnName is not a string after interpreting</key>
+ </entry>
+ <entry>
+ <key>[%0]%1 is an object but seems not to be a valid array or array-like</key>
+ </entry>
+ <entry>
+ <key>Responsible</key>
+ <value>Verantwortlich</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 fe65e56bc8f..9650fc1e465 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -2896,6 +2896,24 @@
<entry>
<key>This cannot be undone!</key>
</entry>
+ <entry>
+ <key>[%0]the tableName is not a string after interpreting</key>
+ </entry>
+ <entry>
+ <key>[%0]%1 has to be a string or array but it is %2</key>
+ </entry>
+ <entry>
+ <key>[%0]has now an incorrect length; estimated 2 elements but got %1</key>
+ </entry>
+ <entry>
+ <key>[%0]the columnName is not a string after interpreting</key>
+ </entry>
+ <entry>
+ <key>[%0]%1 is an object but seems not to be a valid array or array-like</key>
+ </entry>
+ <entry>
+ <key>Responsible</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/neonView/ActivityEdit_view/ActivityEdit_view.aod b/neonView/ActivityEdit_view/ActivityEdit_view.aod
index 2e264c062b2..4a16fe2dd5f 100644
--- a/neonView/ActivityEdit_view/ActivityEdit_view.aod
+++ b/neonView/ActivityEdit_view/ActivityEdit_view.aod
@@ -38,7 +38,7 @@
</entityFieldLink>
<entityFieldLink>
<name>91514e62-f4f7-4eb7-84c0-8d94adbb3408</name>
- <entityField>CREATOR</entityField>
+ <entityField>RESPONSIBLE</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
diff --git a/neonView/ActivityPreview_view/ActivityPreview_view.aod b/neonView/ActivityPreview_view/ActivityPreview_view.aod
index e142cb9bf33..695059b3a6a 100644
--- a/neonView/ActivityPreview_view/ActivityPreview_view.aod
+++ b/neonView/ActivityPreview_view/ActivityPreview_view.aod
@@ -35,7 +35,7 @@
</entityFieldLink>
<entityFieldLink>
<name>c4569e50-223e-4b99-8253-e8fa72ef45a0</name>
- <entityField>CREATOR</entityField>
+ <entityField>RESPONSIBLE</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
--
GitLab