Skip to content
Snippets Groups Projects
Commit 993fdf62 authored by Benjamin Ulrich's avatar Benjamin Ulrich :speech_balloon:
Browse files

merged origin/2020.2 into 1061035_FixBulkmailThrowError

parents 85157793 d676a03a
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 476 additions and 10744 deletions
.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_UnlinkedMail.xml
+ 1
− 1
View file @ 993fdf62
......@@ -18,7 +18,7 @@
<column name="SUBJECT" type="NVARCHAR(200)"/>
<column name="SENTDATE" type="DATETIME"/>
<column name="SENDER" type="NVARCHAR(1000)"/>
<column name="RECIPIENTS" type="NVARCHAR(4000)"/>
<column name="RECIPIENTS" type="NCLOB"/>
<column name="MAIL" type="NCLOB"/>
</createTable>
<createIndex indexName="IDX_AB_UNLINKEDMAILID_SENTDATE" tableName="AB_UNLINKEDMAIL">
......
.liquibase/Data_alias/basic/2019.3.2/Duplicates/alter_duplicateScanner.xml
+ 1
− 1
View file @ 993fdf62
......@@ -6,7 +6,7 @@
<column name="ID_FIELD_NAME" type="NVARCHAR(100)"/>
</addColumn>
<addColumn tableName="DUPLICATESCANNER">
<column name="SCAN_PATTERN" type="NVARCHAR(4000)"/>
<column name="SCAN_PATTERN" type="NCLOB"/>
</addColumn>
</changeSet>
</databaseChangeLog>
.liquibase/Data_alias/basic/2019.3.2/reworkDbIndexes.xml
+ 10
− 3
View file @ 993fdf62
......@@ -10,6 +10,16 @@
<column name="ACTIVITY_ID"/>
</createIndex>
</changeSet>
<changeSet id="e7527e13-7546-4fa6-ac95-5cc3e1f27056" author="s.listl" dbms="!oracle">
<preConditions onFail="MARK_RAN">
<not>
<changeSetExecuted id="5a0b62f4-6770-454c-9a0e-d60ca16596dd" author="j.goderbauer"/>
</not>
</preConditions>
<createIndex indexName="IDX_TICKET_TASK_ID" tableName="TICKET">
<column name="TASK_ID"/>
</createIndex>
</changeSet>
<!--indexes for all dbms-->
<changeSet author="j.goderbauer" id="5a0b62f4-6770-454c-9a0e-d60ca16596dd">
<!--remove problematic indexes-->
......@@ -46,9 +56,6 @@
</createIndex>
<!--set all the referencing ids as single index now-->
<createIndex indexName="IDX_TICKET_TASK_ID" tableName="TICKET">
<column name="TASK_ID"/>
</createIndex>
<createIndex indexName="IDX_CONTACT_ORGANISATION_ID" tableName="CONTACT">
<column name="ORGANISATION_ID"/>
</createIndex>
......
.liquibase/Data_alias/basic/2020.1.2/AddNullableToDateNew.xml
+ 1
− 1
View file @ 993fdf62
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<changeSet id="0aa81d84-7456-4240-91e0-a915f38abbd7" author="s.pongratz" >
<changeSet id="0aa81d84-7456-4240-91e0-a915f38abbd7" author="s.pongratz" dbms="!oracle">
<addNotNullConstraint columnName="DATE_NEW" tableName="CAMPAIGNCOST" columnDataType="DATETIME" validate="true"/>
<addNotNullConstraint columnName="DATE_NEW" tableName="CAMPAIGNPARTICIPANT" columnDataType="DATETIME" validate="true"/>
<addNotNullConstraint columnName="DATE_NEW" tableName="CAMPAIGNSTEP" columnDataType="DATETIME" validate="true"/>
......
.liquibase/Data_alias/basic/2020.1.2/AlterDatatypeOfKeyColumnsToChar/alter_DocumentTemplatePlaceOfUseDatatype.xml
+ 1
− 0
View file @ 993fdf62
......@@ -15,6 +15,7 @@
<changeSet dbms="!derby" author="b.ulrich" id="85ba6a61-9318-4118-ac4c-e33730f6581d">
<dropPrimaryKey tableName="DOCUMENTTEMPLATE" constraintName="PK_DOCUMENTTEMPLATE_DOCUMENTTEMPLATEID" dropIndex="true"/>
<dropNotNullConstraint tableName="DOCUMENTTEMPLATE" columnName="DOCUMENTTEMPLATEID" columnDataType="VARCHAR(36)"/>
<modifyDataType tableName="DOCUMENTTEMPLATE" columnName="DOCUMENTTEMPLATEID" newDataType="CHAR(36)"/>
<addNotNullConstraint columnName="DOCUMENTTEMPLATEID" tableName="DOCUMENTTEMPLATE" columnDataType="CHAR(36)" validate="true"/>
<addPrimaryKey tableName="DOCUMENTTEMPLATE" constraintName="PK_DOCUMENTTEMPLATE_DOCUMENTTEMPLATEID" columnNames="DOCUMENTTEMPLATEID"/>
......
.liquibase/Data_alias/basic/2020.2.0/optimizeIndizes.xml
+ 0
− 9
View file @ 993fdf62
......@@ -8,15 +8,9 @@
<createIndex tableName="AB_APPOINTMENTLINK" indexName="IDX_APPOINTLINK_OBJECT_ROWID">
<column name="OBJECT_ROWID"/>
</createIndex>
<createIndex tableName="EXPORTTEMPLATEPLACEOFUSE" indexName="IDX_EXPORTTEMPLATEUSE_T_ID">
<column name="EXPORTTEMPLATE_ID"/>
</createIndex>
<createIndex tableName="DOCUMENTTEMPLATEPLACEOFUSE" indexName="IDX_DOCUMENTTEMPLATEUSE_DT_ID">
<column name="DOCUMENTTEMPLATE_ID"/>
</createIndex>
<createIndex tableName="EXPORTTEMPLATEFIELD" indexName="IDX_EXPORTTEMPLATEFIELD_ET_ID">
<column name="EXPORTTEMPLATE_ID"/>
</createIndex>
<createIndex tableName="VISITRECOMMENDATION" indexName="IDX_VISITRECOMMEND_CONTACT_ID">
<column name="CONTACT_ID"/>
</createIndex>
......@@ -29,9 +23,6 @@
<createIndex tableName="LEADIMPORTMAPPINGASSISTANT" indexName="IDX_LEADIMPORTMAPPING_LI_ID">
<column name="LEADIMPORT_ID"/>
</createIndex>
<createIndex tableName="EXPORTTEMPLATESELECTION" indexName="IDX_EXPTEMPLATESEL_TEMPLATE_ID">
<column name="EXPORTTEMPLATE_ID"/>
</createIndex>
<createIndex tableName="AB_PERMISSIONCALENDAR" indexName="IDX_AB_PERMCAL_PROCURER_ROWID">
<column name="PERMISSIONPROCURER_ROWID"/>
</createIndex>
......
.liquibase/Data_alias/basic/2020.2.1/Lead/UpdateImportFields.xml 0 → 100644
+ 35
− 0
View file @ 993fdf62
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<changeSet author="s.pongratz" id="a75320ca-ecd1-4132-9fdf-989897934a85">
<update tableName="AB_KEYWORD_ENTRY">
<column name="KEYID" value="O_COMMINTERNET"/>
<where>AB_KEYWORD_ENTRY.AB_KEYWORD_ENTRYID = ?</where>
<whereParams>
<param value="9ed26d58-cc2f-436e-b67b-afbb9f102bf4" />
</whereParams>
</update>
<update tableName="AB_KEYWORD_ENTRY">
<column name="TITLE" value="LinkedIn (Organisation)"/>
<where>AB_KEYWORD_ENTRY.AB_KEYWORD_ENTRYID = ?</where>
<whereParams>
<param value="97e27378-e733-4629-b0c4-515faf89da7e" />
</whereParams>
</update>
<update tableName="AB_KEYWORD_ENTRY">
<column name="KEYID" value="P_COMMINTERNET"/>
<where>AB_KEYWORD_ENTRY.AB_KEYWORD_ENTRYID = ?</where>
<whereParams>
<param value="01f18fd8-44c1-43ec-8601-bf1fe7e62700" />
</whereParams>
</update>
<update tableName="AB_KEYWORD_ENTRY">
<column name="TITLE" value="LinkedIn (Person)"/>
<where>AB_KEYWORD_ENTRY.AB_KEYWORD_ENTRYID = ?</where>
<whereParams>
<param value="53e06704-e28d-49b5-a49f-e40ca250ee6a" />
</whereParams>
</update>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
.liquibase/Data_alias/basic/2020.2.1/Lead/addColumnLead.xml 0 → 100644
+ 11
− 0
View file @ 993fdf62
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<changeSet author="s.pongratz" id="a894e971-4ce9-4142-ac27-1782d454a01f">
<addColumn tableName="LEAD">
<column name="P_COMMINTERNET" type="NVARCHAR(254)" />
<column name="O_COMMINTERNET" type="NVARCHAR(254)" />
</addColumn>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
.liquibase/Data_alias/basic/2020.2.1/Lead/changelog.xml 0 → 100644
+ 6
− 0
View file @ 993fdf62
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<include file="addColumnLead.xml" relativeToChangelogFile="true" />
<include file="UpdateImportFields.xml" relativeToChangelogFile="true" />
</databaseChangeLog>
.liquibase/Data_alias/basic/2020.2.1/Loghistory/addAb_loghistoryId.xml 0 → 100644
+ 36
− 0
View file @ 993fdf62
<?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="s.kern" id="d4b5f8bc-b211-442a-b417-3b5d3c92def5">
<addColumn tableName="AB_LOGHISTORY">
<column name="AB_LOGHISTORYID" type="CHAR(36)"/>
</addColumn>
</changeSet>
<changeSet author="s.listl" id="4a17921c-8e9a-4605-a9f5-0365e18d25c8" dbms="postgresql">
<update tableName="AB_LOGHISTORY">
<column name="AB_LOGHISTORYID" valueComputed="uid.uuid_generate_v4()"/>
<where>AB_LOGHISTORYID is null</where>
</update>
</changeSet>
<changeSet author="s.listl" id="f78825d7-5521-4598-8ff2-897c4fde96a5" dbms="mssql">
<update tableName="AB_LOGHISTORY">
<column name="AB_LOGHISTORYID" valueComputed="NEWID()"/>
<where>AB_LOGHISTORYID is null</where>
</update>
</changeSet>
<changeSet author="s.listl" id="b0974054-434d-4b80-93e4-e835d4da69ae" dbms="mysql,mariadb">
<update tableName="AB_LOGHISTORY">
<column name="AB_LOGHISTORYID" valueComputed="UUID()"/>
<where>AB_LOGHISTORYID is null</where>
</update>
</changeSet>
<changeSet author="s.listl" id="638b1b87-ba80-42bb-9cbd-6ce892b8d5c1" dbms="oracle">
<update tableName="AB_LOGHISTORY">
<column name="AB_LOGHISTORYID" valueComputed="REGEXP_REPLACE(SYS_GUID(), '(.{8})(.{4})(.{4})(.{4})(.{12})', '\1-\2-\3-\4-\5')"/>
<where>AB_LOGHISTORYID is null</where>
</update>
</changeSet>
<changeSet author="s.listl" id="9a100da4-a467-4156-ab21-51216c7cbb3e">
<addNotNullConstraint columnName="AB_LOGHISTORYID" tableName="AB_LOGHISTORY" columnDataType="char(36)"/>
<addPrimaryKey columnNames="AB_LOGHISTORYID" constraintName="pk_AB_LOGHISTORYID" tableName="AB_LOGHISTORY"/>
</changeSet>
</databaseChangeLog>
.liquibase/Data_alias/basic/2020.2.1/Loghistory/changelog.xml 0 → 100644
+ 5
− 0
View file @ 993fdf62
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<include file="addAb_loghistoryId.xml" relativeToChangelogFile="true" />
</databaseChangeLog>
\ No newline at end of file
.liquibase/Data_alias/basic/2020.2.1/changelog.xml 0 → 100644
+ 6
− 0
View file @ 993fdf62
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<include relativeToChangelogFile="true" file="Loghistory/changelog.xml"/>
<include relativeToChangelogFile="true" file="Lead/changelog.xml"/>
</databaseChangeLog>
.liquibase/Data_alias/changelog.xml
+ 1
− 0
View file @ 993fdf62
......@@ -16,6 +16,7 @@
<include relativeToChangelogFile="true" file="basic/2020.1.2/changelog.xml"/>
<include relativeToChangelogFile="true" file="basic/2020.1.3/changelog.xml"/>
<include relativeToChangelogFile="true" file="basic/2020.2.0/changelog.xml"/>
<include relativeToChangelogFile="true" file="basic/2020.2.1/changelog.xml"/>
<!--enable this only when you definetly want to overwrite the existing data with demo records:-->
<!--<include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>-->
......
aliasDefinition/Data_alias/Data_alias.aod
+ 27
− 0
View file @ 993fdf62
......@@ -8025,6 +8025,20 @@
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>AB_LOGHISTORYID</name>
<dbName></dbName>
<primaryKey v="true" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
<index v="true" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
......@@ -11346,6 +11360,19 @@
<documentation></documentation>
<title></title>
<description></description>
<customProperties>
<customBooleanProperty>
<name>log</name>
<global v="false" />
<description></description>
<property v="true" />
</customBooleanProperty>
<customStringProperty>
<name>keyword</name>
<global v="false" />
<property>SerialLetterStatus</property>
</customStringProperty>
</customProperties>
</entityFieldDb>
</entityFields>
</entityDb>
......
aliasDefinition/Data_alias/Data_alias.aod.orig deleted 100644 → 0
+ 0
− 10717
View file @ 85157793
This diff is collapsed.
application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
+ 4
− 0
View file @ 993fdf62
......@@ -297,6 +297,10 @@
<kind v="10077" />
<title></title>
</entityNode>
<entityNode>
<name>AuditLogHistory</name>
<kind v="10077" />
</entityNode>
<entityNode>
<name>ExportTemplate</name>
<kind v="10077" />
......
entity/360Degree_entity/entityfields/active/dropDownProcess.js
+ 4
− 4
View file @ 993fdf62
import("system.vars");
import("system.result");
import("system.translate");
import("system.vars");
import("system.result");
import("system.translate");
result.object([["true", translate.text("True")], ["false",translate.text("False")]]);
\ No newline at end of file
entity/Activity_entity/Activity_entity.aod
+ 0
− 7
View file @ 993fdf62
......@@ -157,7 +157,6 @@
<title>Date (Month)</title>
<contentType>TEXT</contentType>
<groupable v="true" />
<valueProcess>%aditoprj%/entity/Activity_entity/entityfields/entrymonth/valueProcess.js</valueProcess>
<onValueChangeTypes>
<element>MASK</element>
<element>PROCESS</element>
......@@ -395,7 +394,6 @@
<name>ENTRYDAY</name>
<title>Date (Day)</title>
<groupable v="true" />
<valueProcess>%aditoprj%/entity/Activity_entity/entityfields/entryday/valueProcess.js</valueProcess>
</entityField>
<entityConsumer>
<name>Attributes</name>
......@@ -563,7 +561,6 @@
<name>ENTRYYEAR</name>
<title>Date (Year)</title>
<groupable v="true" />
<valueProcess>%aditoprj%/entity/Activity_entity/entityfields/entryyear/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>bindata</name>
......@@ -799,10 +796,6 @@
<recordfield>ACTIVITY.ACTIVITYID</recordfield>
<aggregateType>COUNT</aggregateType>
</aggregateFieldDbMapping>
<dbRecordFieldMapping>
<name>COUNT.value</name>
<expression>%aditoprj%/entity/Activity_entity/recordcontainers/db/recordfieldmappings/count.value/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>ENTRYDAY.value</name>
<expression>%aditoprj%/entity/Activity_entity/recordcontainers/db/recordfieldmappings/entryday.value/expression.js</expression>
......
entity/Activity_entity/entityfields/entrymonth/displayValueProcess.js
+ 0
− 1
View file @ 993fdf62
......@@ -10,4 +10,3 @@ if (m) {
let monthDate = new Date(2020, m-1);
result.string(translate.text(datetime.toDate(monthDate.getTime(), "MMMM", "UTC")));
}
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