Skip to content
Snippets Groups Projects
Commit 877c440e authored by Andreas Schindlbeck's avatar Andreas Schindlbeck
Browse files

Mergecommit: Master into NotificationCenter

parents 96817086 e4168188
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 125 additions and 46 deletions
.liquibase/Data_alias/basic/2019.2/changelog.xml
+ 2
− 0
View file @ 877c440e
......@@ -142,4 +142,6 @@
<include relativeToChangelogFile="true" file="change_Milestone_datatype_to_new_Keyword_logic_notDerby.xml" />
<include relativeToChangelogFile="true" file="change_Milestone_datatype_to_new_Keyword_logic_Derby.xml" />
<include relativeToChangelogFile="true" file="update_Milestone_to_new_Keyword.xml" />
<include relativeToChangelogFile="true" file="data/example_person/PERSON_admin.xml" context="example"/>
</databaseChangeLog>
.liquibase/Data_alias/basic/2019.2/data/example_person/PERSON_admin.xml 0 → 100644
+ 60
− 0
View file @ 877c440e
<?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="d750c022-e34c-4903-8146-bd89121c0214">
<insert tableName="PERSON">
<column name="PERSONID" value="b16282bd-254e-4569-a56e-675449821467"/>
<column name="FIRSTNAME" value="Tim"/>
<column name="MIDDLENAME"/>
<column name="LASTNAME" value="Admin"/>
<column name="SALUTATION" value="Herr"/>
<column name="DATEOFBIRTH" valueDate="1993-05-07"/>
<column name="USER_NEW" value="Admin"/>
<column name="DATE_NEW" valueComputed="current_datetime"/>
</insert>
<insert tableName="CONTACT">
<column name="RELATIONSHIP" valueNumeric="1"/>
<column name="LANGUAGE" value="deu"/>
<column name="PERSON_ID" value="b16282bd-254e-4569-a56e-675449821467"/>
<column name="CONTACTID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
<column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
<column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
<column name="USER_NEW" value="Admin"/>
<column name="DATE_NEW" valueComputed="current_datetime"/>
</insert>
<insert tableName="COMMUNICATION">
<column name="COMMUNICATIONID" value="3ccc54d5-dfb0-4da9-a0a0-472025f65994"/>
<column name="CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
<column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
<column name="ADDR" value="Admin@domain.local"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_NEW" value="Admin"/>
<column name="DATE_NEW" valueComputed="current_datetime"/>
</insert>
<rollback>
<delete tableName="CONTACT">
<where>CONTACTID = ?</where>
<whereParams>
<param value="c7ddf982-0e58-4152-b82b-8f5673b0b729" />
</whereParams>
</delete>
<delete tableName="COMMUNICATION">
<where>CONTACTID = ?</where>
<whereParams>
<param value="c7ddf982-0e58-4152-b82b-8f5673b0b729" />
</whereParams>
</delete>
<delete tableName="PERSON">
<where>PERSONID = ?</where>
<whereParams>
<param value="b16282bd-254e-4569-a56e-675449821467" />
</whereParams>
</delete>
<delete tableName="ADDRESS">
<where>CONTACT_ID = ?</where>
<whereParams>
<param value="c7ddf982-0e58-4152-b82b-8f5673b0b729" />
</whereParams>
</delete>
</rollback>
</changeSet>
</databaseChangeLog>
.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/_____configuration.xml
+ 1
− 1
View file @ 877c440e
<?xml version="1.0" encoding="UTF-8"?>
<aliasConfig xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.7" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/aliasConfig/1.0.7">
<aliasConfig xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/aliasConfig/1.1.0">
<name>_____CONFIGURATION</name>
<serverId>default</serverId>
<definitionName>_____CONFIGURATION</definitionName>
......
.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/_____system_sysdb_version.xml
+ 1
− 1
View file @ 877c440e
<?xml version="1.0" encoding="UTF-8"?>
<sysDbVersion 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/sysDbVersion/1.2.0">
<name>_____SYSTEM_SYSDB_VERSION</name>
<systemDbVersion>2.5.1</systemDbVersion>
<systemDbVersion>2.6.0</systemDbVersion>
</sysDbVersion>
.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/data_alias.xml
+ 1
− 1
View file @ 877c440e
<?xml version="1.0" encoding="UTF-8"?>
<aliasConfig xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.7" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/aliasConfig/1.0.7">
<aliasConfig xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/aliasConfig/1.1.0">
<name>f50ee138-12d9-420d-a4f9-9b8257e207e4</name>
<description>jdbc:derby://localhost:1527/basic_data</description>
<serverId>default</serverId>
......
.liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_system.xml
+ 1
− 1
View file @ 877c440e
......@@ -7,7 +7,7 @@
<column name="DATE_NEW" valueDate="2018-05-24T14:53:57.763"/>
<column name="KIND" valueNumeric="600"/>
<column name="NAME" value="_____SYSTEM_SYSDB_VERSION"/>
<column name="TITLE" value="2.5.1"/>
<column name="TITLE" value="2.6.0"/>
<column name="USER_EDIT" value="_____DESIGNERANONYM"/>
<column name="USER_NEW" value="_____DESIGNERANONYM"/>
<column name="XMLDATA" valueBlobFile="defaultBlob/_____system_sysdb_version.xml"/>
......
.liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_users-admin.xml
+ 28
− 1
View file @ 877c440e
......@@ -10,6 +10,15 @@
<column name="PROPKEY" value="lastModified"/>
<column name="PROPVAL" value="1544193908535"/>
</insert>
<insert tableName="ASYS_USERS">
<column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
<column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
<column name="GROUPID" value="BASIC"/>
<column name="ID" value="cdb34f95-e414-4807-bbdb-f369138ee49f"/>
<column name="NAME" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
<column name="PROPKEY" value="contactID"/>
<column name="PROPVAL" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
</insert>
<insert tableName="ASYS_USERS">
<column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
<column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
......@@ -19,6 +28,15 @@
<column name="PROPKEY" value="name"/>
<column name="PROPVAL" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
</insert>
<insert tableName="ASYS_USERS">
<column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
<column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
<column name="GROUPID" value="BASIC"/>
<column name="ID" value="c17c88f5-74e2-44a1-ae68-8130918b43d3"/>
<column name="NAME" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
<column name="PROPKEY" value="isActive"/>
<column name="PROPVAL" value="true"/>
</insert>
<insert tableName="ASYS_USERS">
<column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
<column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
......@@ -28,6 +46,15 @@
<column name="PROPKEY" value="title"/>
<column name="PROPVAL" value="Admin"/>
</insert>
<insert tableName="ASYS_USERS">
<column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
<column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
<column name="GROUPID" value="PERSONAL"/>
<column name="ID" value="93c88dff-a6b0-49ce-b7b4-e474b7ca7fb6"/>
<column name="NAME" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
<column name="PROPKEY" value="firstname"/>
<column name="PROPVAL" value="Tim"/>
</insert>
<insert tableName="ASYS_USERS">
<column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
<column name="DATE_NEW" valueDate="2018-05-25T09:52:30.361"/>
......@@ -35,7 +62,7 @@
<column name="ID" value="f63d0946-3960-43bb-9888-4c36d962f955"/>
<column name="NAME" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
<column name="PROPKEY" value="lastname"/>
<column name="PROPVAL" value="Administrator"/>
<column name="PROPVAL" value="Admin"/>
</insert>
<insert tableName="ASYS_USERS">
<column name="DATE_EDIT" valueDate="2018-12-07T15:45:08.535"/>
......
.liquibase/_____SYSTEMALIAS/basic/init/system_aliasTestdata.xml
+ 10
− 10
View file @ 877c440e
<?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">
<include file="data/example_asys_users/Birgit_Leicht.xml"/>
<include file="data/example_asys_binaries/Birgit_Leicht_Image.xml"/>
<include file="data/example_asys_users/Harold_Smith.xml"/>
<include file="data/example_asys_binaries/Harold_Smith_Image.xml"/>
<include file="data/example_asys_users/Herbert_Obermeier.xml"/>
<include file="data/example_asys_binaries/Herbert_Obermeier_Image.xml"/>
<include file="data/example_asys_users/Lisa_Sommer.xml"/>
<include file="data/example_asys_binaries/Lisa_Sommer_Image.xml"/>
<include file="data/example_asys_users/Susanne_Lustig.xml"/>
<include file="data/example_asys_binaries/Susanne_Lustig_Image.xml"/>
<include relativeToChangelogFile="true" file="data/example_asys_users/Birgit_Leicht.xml"/>
<include relativeToChangelogFile="true" file="data/example_asys_binaries/Birgit_Leicht_Image.xml"/>
<include relativeToChangelogFile="true" file="data/example_asys_users/Harold_Smith.xml"/>
<include relativeToChangelogFile="true" file="data/example_asys_binaries/Harold_Smith_Image.xml"/>
<include relativeToChangelogFile="true" file="data/example_asys_users/Herbert_Obermeier.xml"/>
<include relativeToChangelogFile="true" file="data/example_asys_binaries/Herbert_Obermeier_Image.xml"/>
<include relativeToChangelogFile="true" file="data/example_asys_users/Lisa_Sommer.xml"/>
<include relativeToChangelogFile="true" file="data/example_asys_binaries/Lisa_Sommer_Image.xml"/>
<include relativeToChangelogFile="true" file="data/example_asys_users/Susanne_Lustig.xml"/>
<include relativeToChangelogFile="true" file="data/example_asys_binaries/Susanne_Lustig_Image.xml"/>
</databaseChangeLog>
entity/360Degree_entity/entityfields/newmodule/children/newcontract/onActionProcess.js
+ 0
− 1
View file @ 877c440e
import("system.vars");
import("Contract_lib");
import("system.logging");
ContractUtils.createNewContract(vars.getString("$param.ObjectRowId_param"));
\ No newline at end of file
entity/360Degree_entity/entityfields/newmodule/children/newcontract/stateProcess.js
+ 0
− 1
View file @ 877c440e
import("system.result");
import("system.vars");
import("system.neon");
import("system.logging");
var contextList = JSON.parse(vars.getString("$param.ObjectType_param"));
var found = false;
......
entity/360Degree_entity/recordcontainers/jdito/contentProcess.js
+ 0
− 2
View file @ 877c440e
import("system.logging");
import("system.util");
import("system.db");
import("system.vars");
import("system.result");
import("Context_lib");
import("system.translate");
import("system.logging");
var resultList = [];
if (vars.exists("$param.ObjectType_param") && vars.get("$param.ObjectType_param") && vars.exists("$param.ObjectRowId_param") && vars.get("$param.ObjectRowId_param"))
......
entity/Activity_entity/Activity_entity.aod
+ 1
− 0
View file @ 877c440e
......@@ -58,6 +58,7 @@
</entityParameter>
<entityField>
<name>SUBJECT_DETAILS</name>
<linkedContext>Activity</linkedContext>
<valueProcess>%aditoprj%/entity/Activity_entity/entityfields/subject_details/valueProcess.js</valueProcess>
</entityField>
<entityField>
......
entity/Address_entity/recordcontainers/db/onDBInsert.js
+ 0
− 1
View file @ 877c440e
import("system.logging");
import("system.vars");
import("StandardObject_lib");
......
entity/AppointmentLink_entity/entityfields/objectid/displayValueProcess.js
+ 0
− 1
View file @ 877c440e
import("system.logging");
import("system.db");
import("system.vars");
import("system.result");
......
entity/AppointmentLink_entity/entityfields/objecttype/displayValueProcess.js
+ 8
− 10
View file @ 877c440e
import("system.logging");
import("system.result");
import("system.neon");
import("system.vars");
import("system.project");
if (vars.exists("$field.OBJECTTYPE") && vars.get("$field.OBJECTTYPE"))
{
logging.log("objecttype value: " + project.getDataModel(project.DATAMODEL_KIND_CONTEXT, vars.get("$field.OBJECTTYPE"))[1]);
result.string(project.getDataModel(project.DATAMODEL_KIND_CONTEXT, vars.get("$field.OBJECTTYPE"))[1]);
import("system.result");
import("system.neon");
import("system.vars");
import("system.project");
if (vars.exists("$field.OBJECTTYPE") && vars.get("$field.OBJECTTYPE"))
{
result.string(project.getDataModel(project.DATAMODEL_KIND_CONTEXT, vars.get("$field.OBJECTTYPE"))[1]);
}
\ No newline at end of file
entity/Appointment_entity/entityfields/summary/valueProcess.js
+ 0
− 2
View file @ 877c440e
......@@ -9,8 +9,6 @@ import("system.result");
*/
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.Entry_param"))
{
logging.log()
var event = JSON.parse(vars.getString("$param.Entry_param"));
if(event[calendars.SUMMARY])
......
entity/Attribute_entity/Attribute_entity.aod
+ 4
− 0
View file @ 877c440e
......@@ -278,6 +278,10 @@
</entityParameter>
</children>
</entityConsumer>
<entityField>
<name>IMAGE</name>
<contentType>IMAGE</contentType>
</entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
......
entity/Attribute_entity/entityfields/name_with_type/valueProcess.js
+ 8
− 11
View file @ 877c440e
import("system.translate");
import("system.result");
import("system.vars");
import("Attribute_lib");
import("Keyword_lib");
import("KeywordRegistry_basic")
var name = vars.get("$field.ATTRIBUTE_NAME");
var type = vars.get("$field.ATTRIBUTE_TYPE");
if (type.trim() != $AttributeTypes.COMBOVALUE)
name += " (" + translate.text("Type") + ": " + KeywordUtils.getViewValue($KeywordRegistry.attributeType(), type) + ")";
import("system.translate");
import("system.result");
import("system.vars");
import("Attribute_lib");
var name = vars.get("$field.ATTRIBUTE_NAME");
if (vars.get("$field.ATTRIBUTE_TYPE").trim() != $AttributeTypes.COMBOVALUE)
name += " (" + translate.text("Type") + ": " + vars.get("$field.ATTRIBUTE_TYPE.displayValue") + ")";
result.string(name);
\ No newline at end of file
entity/Communication_entity/recordcontainers/db/onDBUpdate.js
+ 0
− 1
View file @ 877c440e
import("system.logging");
import("system.vars");
import("StandardObject_lib");
......
entity/Contact_entity/entityfields/address_id/valueProcess.js
+ 0
− 1
View file @ 877c440e
import("system.logging");
import("system.result");
import("system.vars");
import("StandardObject_lib");
......
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