merged origin/2020.2 into 2020.2.1

.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_UnlinkedMail.xml

@@ -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

@@ -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,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

 <?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

@@ -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"/>
         <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

@@ -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>

entity/Campaign_entity/recordcontainers/db/filterextensions/favorite_filter/filterValuesProcess.js

-import("Favorites_lib");
+import("Context_lib");
 import("system.result");
+import("Favorites_lib");
 
-result.object(FavoritesUtil.getUserFavoriteGroups());
+result.object(FavoritesUtil.getUserFavoriteGroupsByContext(ContextUtils.getCurrentContextId()));
\ No newline at end of file

entity/Contract_entity/recordcontainers/db/filterextensions/favorite_filter/filterValuesProcess.js

-import("Favorites_lib");
+import("Context_lib");
 import("system.result");
+import("Favorites_lib");
 
-result.object(FavoritesUtil.getUserFavoriteGroups());
+result.object(FavoritesUtil.getUserFavoriteGroupsByContext(ContextUtils.getCurrentContextId()));
\ No newline at end of file

entity/DocumentTemplatePlaceOfUse_entity/DocumentTemplatePlaceOfUse_entity.aod

@@ -43,6 +43,10 @@
           <name>Blacklist_param</name>
           <valueProcess>%aditoprj%/entity/DocumentTemplatePlaceOfUse_entity/entityfields/contextdocumenttemplateplaceofuse/children/blacklist_param/valueProcess.js</valueProcess>
         </entityParameter>
+        <entityParameter>
+          <name>GetAllContexts_param</name>
+          <valueProcess>%aditoprj%/entity/DocumentTemplatePlaceOfUse_entity/entityfields/contextdocumenttemplateplaceofuse/children/getallcontexts_param/valueProcess.js</valueProcess>
+        </entityParameter>
       </children>
     </entityConsumer>
     <entityProvider>

entity/DocumentTemplatePlaceOfUse_entity/entityfields/contextdocumenttemplateplaceofuse/children/blacklist_param/valueProcess.js

 import("system.result");
 
-result.object(["Person", "Organisation", "Offer"]);
+result.object(["Person", "Organisation", "Offer", "MarketingWorkflowLauncher"]);
\ No newline at end of file

entity/DocumentTemplatePlaceOfUse_entity/entityfields/contextdocumenttemplateplaceofuse/children/getallcontexts_param/valueProcess.js

+import("system.result");
+
+result.string(true);
\ No newline at end of file

entity/DocumentTemplate_entity/recordcontainers/db/filterextensions/favorite_filter/filterValuesProcess.js

-import("Favorites_lib");
+import("Context_lib");
 import("system.result");
+import("Favorites_lib");
 
-result.object(FavoritesUtil.getUserFavoriteGroups());
+result.object(FavoritesUtil.getUserFavoriteGroupsByContext(ContextUtils.getCurrentContextId()));
\ No newline at end of file

entity/ExportTemplate_entity/recordcontainers/db/filterextensions/favorite_filter/filterValuesProcess.js

-import("Favorites_lib");
+import("Context_lib");
 import("system.result");
+import("Favorites_lib");
 
-result.object(FavoritesUtil.getUserFavoriteGroups());
+result.object(FavoritesUtil.getUserFavoriteGroupsByContext(ContextUtils.getCurrentContextId()));
\ No newline at end of file

entity/MarketingWorkflowLauncher_entity/MarketingWorkflowLauncher_entity.aod

+<?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.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17">
+  <name>MarketingWorkflowLauncher_entity</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <title>Marketing workflow</title>
+  <recordContainer>dataLess</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
+    <entityField>
+      <name>DOCUMENTTEMPLATE_ID</name>
+      <title>Document template</title>
+      <consumer>EmailTemplates</consumer>
+      <mandatory v="true" />
+      <state>EDITABLE</state>
+    </entityField>
+    <entityConsumer>
+      <name>WorkflowLauncherIntegration</name>
+      <isOneToOneRelationship v="true" />
+      <dependency>
+        <name>dependency</name>
+        <entityName>WorkflowLauncher_entity</entityName>
+        <fieldName>Integration</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>Validationerrors_param</name>
+          <valueProcess>%aditoprj%/entity/MarketingWorkflowLauncher_entity/entityfields/workflowlauncherintegration/children/validationerrors_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>ProcessVariables_param</name>
+          <valueProcess>%aditoprj%/entity/MarketingWorkflowLauncher_entity/entityfields/workflowlauncherintegration/children/processvariables_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>Targets_param</name>
+          <valueProcess>%aditoprj%/entity/MarketingWorkflowLauncher_entity/entityfields/workflowlauncherintegration/children/targets_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>TargetContext_param</name>
+          <valueProcess>%aditoprj%/entity/MarketingWorkflowLauncher_entity/entityfields/workflowlauncherintegration/children/targetcontext_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+    <entityParameter>
+      <name>ObjectType_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityParameter>
+      <name>ObjectIds_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityParameter>
+      <name>ObjectFilter_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityConsumer>
+      <name>EmailTemplates</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>DocumentTemplate_entity</entityName>
+        <fieldName>DocumentTemplateProvider</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>DocumentTemplateType_param</name>
+          <valueProcess>%aditoprj%/entity/MarketingWorkflowLauncher_entity/entityfields/emailtemplates/children/documenttemplatetype_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>ComingFrom_param</name>
+          <valueProcess>%aditoprj%/entity/MarketingWorkflowLauncher_entity/entityfields/emailtemplates/children/comingfrom_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
+  </entityFields>
+  <recordContainers>
+    <datalessRecordContainer>
+      <name>dataLess</name>
+    </datalessRecordContainer>
+  </recordContainers>
+</entity>

entity/MarketingWorkflowLauncher_entity/entityfields/emailtemplates/children/comingfrom_param/valueProcess.js

+import("Context_lib");
+import("system.result");
+
+result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file

entity/MarketingWorkflowLauncher_entity/entityfields/emailtemplates/children/documenttemplatetype_param/valueProcess.js

+import("system.result");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.documentTemplateType$mail());
\ No newline at end of file

entity/MarketingWorkflowLauncher_entity/entityfields/workflowlauncherintegration/children/processvariables_param/valueProcess.js

+import("system.vars");
+import("system.result");
+
+var variables = {
+    documentTemplate: vars.get("$field.DOCUMENTTEMPLATE_ID")
+};
+result.string(JSON.stringify(variables));
\ No newline at end of file

entity/MarketingWorkflowLauncher_entity/entityfields/workflowlauncherintegration/children/targetcontext_param/valueProcess.js

+import("Context_lib");
+import("system.result");
+
+result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file

entity/MarketingWorkflowLauncher_entity/entityfields/workflowlauncherintegration/children/targets_param/valueProcess.js

+import("Util_lib");
+import("system.vars");
+import("system.result");
+
+var context = vars.get("$param.ObjectType_param");
+var targets = Utils.parseJSON(vars.get("$param.ObjectIds_param")) || [];
+targets = targets.map(function (targetId)
+{
+    if (Utils.isString(targetId))
+        return [targetId, context]; //todo: context dynamic (eg for participants)
+    return targetId;
+});
+result.string(JSON.stringify(targets));
\ No newline at end of file