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

activity: rename CREATOR to RESPONSIBLE

parent a58ecab3
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 99 additions and 43 deletions
.liquibase/Data_alias/basic/2019.2/activity_rename_Creator_to_Responsible.xml 0 → 100644
+ 9
− 0
View file @ 2aa2b614
<?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>
.liquibase/Data_alias/basic/2019.2/changelog.xml
+ 2
− 0
View file @ 2aa2b614
......@@ -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>
aliasDefinition/Data_alias/Data_alias.aod
+ 14
− 28
View file @ 2aa2b614
......@@ -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>
......
entity/Activity_entity/Activity_entity.aod
+ 12
− 12
View file @ 2aa2b614
......@@ -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>
......
entity/Activity_entity/recordcontainers/db/conditionProcess.js
+ 1
− 1
View file @ 2aa2b614
......@@ -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
......
entity/Activity_entity/recordcontainers/db/recordfieldmappings/creator.displayvalue/expression.js → entity/Activity_entity/recordcontainers/db/recordfieldmappings/responsible.displayvalue/expression.js
+ 4
− 0
View file @ 2aa2b614
import("system.result");
import("Person_lib");
result.string(PersUtils.getResolvingDisplaySubSql("CREATOR"))
\ No newline at end of file
result.string(PersUtils.getResolvingDisplaySubSql("RESPONSIBLE"))
\ No newline at end of file
language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+ 18
− 0
View file @ 2aa2b614
......@@ -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>
......
language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+ 19
− 0
View file @ 2aa2b614
......@@ -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>
language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+ 18
− 0
View file @ 2aa2b614
......@@ -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>
neonView/ActivityEdit_view/ActivityEdit_view.aod
+ 1
− 1
View file @ 2aa2b614
......@@ -38,7 +38,7 @@
</entityFieldLink>
<entityFieldLink>
<name>91514e62-f4f7-4eb7-84c0-8d94adbb3408</name>
<entityField>CREATOR</entityField>
<entityField>RESPONSIBLE</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
......
neonView/ActivityPreview_view/ActivityPreview_view.aod
+ 1
− 1
View file @ 2aa2b614
......@@ -35,7 +35,7 @@
</entityFieldLink>
<entityFieldLink>
<name>c4569e50-223e-4b99-8253-e8fa72ef45a0</name>
<entityField>CREATOR</entityField>
<entityField>RESPONSIBLE</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
......
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