merged 2021.2.1 into cm_sp_2000811_SmalFixes

2ececcea · Sebastian Pongratz · 01bf16b1 · 935e1d09 · 2ececcea · 2ececcea
Commit 2ececcea authored 3 years ago by Sebastian Pongratz
--- a/.liquibase/Data_alias/basic/2021.1.2/ModularCommunication/add_CommunicationObjectType.xml
+++ b/.liquibase/Data_alias/basic/2021.1.2/ModularCommunication/add_CommunicationObjectType.xml
@@ -20,7 +20,7 @@
        <column name="OBJECT_ROWID" valueComputed="CONTACT_ID"/>
        <column name="OBJECT_TYPE" value="Contact"/>
    </update>
-    
+    <dropIndex tableName="COMMUNICATION" indexName="IDX_COMMUNICATION_CONTACT_ID" />
    <dropColumn tableName="COMMUNICATION">  
        <column  name="CONTACT_ID"/>  
    </dropColumn>  

--- a/.liquibase/Data_alias/basic/2021.1.3/Classification/alter_ClassificationStorage.xml
+++ b/.liquibase/Data_alias/basic/2021.1.3/Classification/alter_ClassificationStorage.xml
@@ -2,6 +2,12 @@
 <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="b.ulrich" id="7eb72f9e-1d36-4174-97cb-062e40f72bf7">
+        
+        <!--Needed for MS SQL, otherwise the column can't be deleted-->
+        <dropDefaultValue
+            columnDataType="int"  
+            columnName="OUTDATED"
+            tableName="CLASSIFICATIONSTORAGE"/>  
        <dropColumn tableName="CLASSIFICATIONSTORAGE" columnName="OUTDATED"/>
    </changeSet>
 </databaseChangeLog>
--- a/.liquibase/Data_alias/basic/2021.1.3/Classification/alter_ClassificationType.xml
+++ b/.liquibase/Data_alias/basic/2021.1.3/Classification/alter_ClassificationType.xml
@@ -2,6 +2,12 @@
 <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="b.ulrich" id="21094fcf-539e-4514-8986-e681747a33e2">
+        
+        <!--Needed for MS SQL, otherwise the column can't be deleted-->
+        <dropDefaultValue
+            columnDataType="int"  
+            columnName="OUTDATED"
+            tableName="CLASSIFICATIONTYPE"/>  
        <dropColumn tableName="CLASSIFICATIONTYPE" columnName="OUTDATED"/>
        <addColumn tableName="CLASSIFICATIONTYPE">
            <column name="SORTING"  type="SMALLINT" />

--- a/.liquibase/Data_alias/basic/2021.2.1/MissingIndizes/add_MissingIndizes.xml
+++ b/.liquibase/Data_alias/basic/2021.2.1/MissingIndizes/add_MissingIndizes.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 author="b.ulrich" id="7de26c77-92b4-40f0-954d-95828ebdc5f4">
+    <createIndex tableName="BULKMAIL" indexName="IDX_BULKMAIL_INTEREST_ID">
+        <column name="INTEREST_ID"/>
+    </createIndex>
+    <createIndex tableName="BULKMAIL" indexName="IDX_BULKMAIL_EMPCONTACT_ID">
+        <column name="EMPLOYEE_CONTACT_ID"/>
+    </createIndex>
+    <createIndex tableName="BULKMAIL" indexName="IDX_BULKMAIL_MOSAICOTMPL_ID">
+        <column name="MOSAICOTEMPLATE_ID"/>
+    </createIndex>
+    <createIndex tableName="TICKET" indexName="IDX_TICKET_INBOX_ID">
+        <column name="INBOX_ID"/>
+    </createIndex>
+    <createIndex tableName="TICKET" indexName="IDX_TICKET_MAILSIGNATURE_ID">
+        <column name="MAILSIGNATURE_ID"/>
+    </createIndex>
+    <createIndex tableName="TICKET" indexName="IDX_TICKET_ORDER_ID">
+        <column name="ORDER_ID"/>
+    </createIndex>
+    <createIndex tableName="TICKET" indexName="IDX_TICKET_EDITOR_CONTACT_ID">
+        <column name="EDITOR_CONTACT_ID"/>
+    </createIndex>
+    <createIndex tableName="DISTRICTCONTACT" indexName="IDX_DISTRCONTACT_DISTRRESP_ID">
+        <column name="DISTRICTRESPONSIBLE_ID"/>
+    </createIndex>
+    <createIndex tableName="WEBLINKTAG" indexName="IDX_WEBLINKTAG_WEBLINK_ID">
+        <column name="WEBLINK_ID"/>
+    </createIndex>
+    <createIndex tableName="MAIL_LOG" indexName="IDX_MAIL_LOG_CONTACT_ID">
+        <column name="CONTACT_ID"/>
+    </createIndex>
+    <createIndex tableName="MAIL_RUN" indexName="IDX_MAIL_RUN_OBJECT_ROWID">
+        <column name="OBJECT_ROWID"/>
+    </createIndex>
+    <createIndex tableName="BULKMAILTESTRECIPIENT" indexName="IDX_BULKMAILTESTREC_BULKMAI_ID">
+        <column name="BULKMAIL_ID"/>
+    </createIndex>
+    <createIndex tableName="BULKMAILTESTRECIPIENT" indexName="IDX_BULKMAILTESTREC_CONTACT_ID">
+        <column name="CONTACT_ID"/>
+    </createIndex>
+    <createIndex tableName="WEBLINK_CLICK" indexName="IDX_WEBLINK_CLICK_WEBLINK_ID">
+        <column name="WEBLINK_ID"/>
+    </createIndex>
+    <createIndex tableName="EWS_INFO_LOG" indexName="IDX_EWS_INFO_LOG_USER_ID">
+        <column name="USER_ID"/>
+    </createIndex>
+    <createIndex tableName="ADVERTISINGITEM" indexName="IDX_ADVERTISINGITEM_INFO_PRODUCT_ID">
+        <column name="PRODUCT_ID"/>
+    </createIndex>
+    <createIndex tableName="MAIL_BOUNCE" indexName="IDX_MAIL_BOUNCE_EMFILTHANDL_ID">
+        <column name="EMAIL_FILTER_HANDLING_ID"/>
+    </createIndex>
+    <createIndex tableName="TASKATTENDEES" indexName="IDX_TASKATTENDEES_TASK_ID">
+        <column name="TASK_ID"/>
+    </createIndex>
+    <createIndex tableName="INBOX_EMPLOYEEGROUP_RELATION" indexName="IDX_INBOX_EMPGR_RELAT_EMPGR_ID">
+        <column name="EMPLOYEEGROUP_ID"/>
+    </createIndex>
+    <createIndex tableName="INBOX_EMPLOYEEGROUP_RELATION" indexName="IDX_INBOX_EMPGR_RELAT_INBOX_ID">
+        <column name="INBOX_ID"/>
+    </createIndex>
+    <createIndex tableName="INBOXFILTER" indexName="IDX_INBOXFILTER_INFILTGROUP_ID">
+        <column name="INBOXFILTERGROUP_ID"/>
+    </createIndex>
+    <createIndex tableName="INBOXFILTER" indexName="IDX_INBOXFILTER_TICKETTEMP_ID">
+        <column name="TICKETTEMPLATE_ID"/>
+    </createIndex>
+    <createIndex tableName="INBOXFILTERGROUP_RELATION" indexName="IDX_INBXFILTGRRL_INBXFILTGR_ID">
+        <column name="INBOXFILTERGROUP_ID"/>
+    </createIndex>
+    <createIndex tableName="INBOXFILTERGROUP_RELATION" indexName="IDX_INBXFILTGRRL_INBOX_ID">
+        <column name="INBOX_ID"/>
+    </createIndex>
+    <createIndex tableName="EMPLOYEEGROUP_CONTACT_RELATION" indexName="IDX_EMPGR_CON_REL_EMPGROUP_ID">
+        <column name="EMPLOYEEGROUP_ID"/>
+    </createIndex>
+    <createIndex tableName="EMPLOYEEGROUP_CONTACT_RELATION" indexName="IDX_EMPGR_CON_REL_CONTACT_ID">
+        <column name="CONTACT_ID"/>
+    </createIndex>
+    <createIndex tableName="TICKETTEMPLATE" indexName="IDX_TICKETTEMPLATE_INBOX_ID">
+        <column name="INBOX_ID"/>
+    </createIndex>
+    <createIndex tableName="TICKETTEMPLATE" indexName="IDX_TICKETTEMPLATE_DOCTEMP_ID">
+        <column name="DOCUMENTTEMPLATE_ID"/>
+    </createIndex>
+    <createIndex tableName="MAILSIGNATURE" indexName="IDX_MAILSIGNATURE_INBOX_ID">
+        <column name="INBOX_ID"/>
+    </createIndex>
+    <createIndex tableName="MAILSIGNATURE" indexName="IDX_MAILSIGNATURE_DOCTEMP_ID">
+        <column name="DOCUMENTTEMPLATE_ID"/>
+    </createIndex>
+    <createIndex tableName="MAILSIGNATURE" indexName="IDX_MAILSGNTRE_DEF_TICKTEMP_ID">
+        <column name="DEFAULT_TICKETTEMPLATE_ID"/>
+    </createIndex>
+    <createIndex tableName="MAILSIGNATURE" indexName="IDX_MAILSGNTRE_SIG_DOCTEMP_ID">
+        <column name="SIGNATURE_DOCUMENTTEMPLATE_ID"/>
+    </createIndex>
+    <createIndex tableName="ATTRIBUTE_FILTER" indexName="IDX_ATTR_FILT_INBXFILTGR_ID">
+        <column name="INBOXFILTERGROUP_ID"/>
+    </createIndex>
+    <createIndex tableName="EMPLOYEEGROUP_RULEGROUP_RELATION" indexName="IDX_EMPGROULRLREL_EMPGROUP_ID">
+        <column name="EMPLOYEEGROUP_ID"/>
+    </createIndex>
+    <createIndex tableName="EMPLOYEEGROUP_RULEGROUP_RELATION" indexName="IDX_EMPGRLRLREL_EMPRLGROUP_ID">
+        <column name="EMPLOYEEGROUP_RULEGROUP_ID"/>
+    </createIndex>
+    <createIndex tableName="EMPLOYEEGROUP_RULE" indexName="IDX_EMPGRLRULE_EMPRLGROUP_ID">
+        <column name="EMPLOYEEGROUP_RULEGROUP_ID"/>
+    </createIndex>
+    <createIndex tableName="DOCUMENTTEMPLATE_TICKETCATEGORY" indexName="IDX_DOCTEMP_TICKCAT_DOCTEMP_ID">
+        <column name="DOCUMENTTEMPLATE_ID"/>
+    </createIndex>
+    <createIndex tableName="SALESORDERLINK" indexName="IDX_SALESORDLINK_OBJECT_ROWID">
+        <column name="OBJECT_ROWID"/>
+    </createIndex>
+    <createIndex tableName="SALESORDERLINK" indexName="IDX_SALESORDLINK_SALESORDER_ID">
+        <column name="SALESORDER_ID"/>
+    </createIndex>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
--- a/.liquibase/Data_alias/basic/2021.2.1/changelog.xml
+++ b/.liquibase/Data_alias/basic/2021.2.1/changelog.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">
+    <include relativeToChangelogFile="true" file="MissingIndizes/add_MissingIndizes.xml"/>
+</databaseChangeLog>
\ No newline at end of file
--- a/.liquibase/Data_alias/changelog.xml
+++ b/.liquibase/Data_alias/changelog.xml
@@ -28,6 +28,7 @@
    <include relativeToChangelogFile="true" file="basic/2021.1.2/changelog.xml"/>
    <include relativeToChangelogFile="true" file="basic/2021.1.3/changelog.xml"/>
    <include relativeToChangelogFile="true" file="basic/2021.2.0/changelog.xml"/>
+    <include relativeToChangelogFile="true" file="basic/2021.2.1/changelog.xml"/>

    <include relativeToChangelogFile="true" file="basic/workflows/changelog.xml" context="workflow"/>
    <include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>

--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -630,11 +630,10 @@
        </entityActionField>
        <entityActionField>
          <name>addAttributeToSelection</name>
-          <title>Set attribute (use filter result)</title>
+          <title>Set attribute</title>
          <onActionProcess>%aditoprj%/entity/Activity_entity/entityfields/filteractions/children/addattributetoselection/onActionProcess.js</onActionProcess>
          <isObjectAction v="false" />
          <iconId>VAADIN:TAGS</iconId>
-          <titleProcess>%aditoprj%/entity/Activity_entity/entityfields/filteractions/children/addattributetoselection/titleProcess.js</titleProcess>
        </entityActionField>
      </children>
    </entityActionGroup>

--- a/entity/Activity_entity/entityfields/filteractions/children/addattributetoselection/onActionProcess.js
+++ b/entity/Activity_entity/entityfields/filteractions/children/addattributetoselection/onActionProcess.js
+import("system.neonFilter");
 import("system.translate");
 import("system.neon");
 import("Context_lib");
@@ -23,4 +24,5 @@ var params = {
    "ContextTitlePlural_param": translate.text("Activities")
 }

-neon.openContext("AddAttributesToSelection", "AddAttributesToSelectionEdit_view", null, neon.OPERATINGSTATE_NEW, params, null);
\ No newline at end of file
+var recipe = neonFilter.createEntityRecordsRecipeBuilder().parameters(params).toString();
+neon.openContextWithRecipe("AddAttributesToSelection", "AddAttributesToSelectionEdit_view", recipe, neon.OPERATINGSTATE_NEW);
--- a/entity/Activity_entity/entityfields/msteamsactions/children/importfromteams/onActionProcess.js
+++ b/entity/Activity_entity/entityfields/msteamsactions/children/importfromteams/onActionProcess.js
+import("system.neonFilter");
 import("system.vars");
 import("system.neon");

-neon.openContext("MSTeamsActivityImport", "MSTeamsActivityImportEdit_view", null, neon.OPERATINGSTATE_VIEW, {
+var recipe = neonFilter.createEntityRecordsRecipeBuilder().parameters({
    "ObjectRowId_param" : vars.get("$param.RowId_param"),
    "ObjectType_param": vars.get("$param.ObjectId_param")
-});
\ No newline at end of file
+}).toString();
+neon.openContextWithRecipe("MSTeamsActivityImport", "MSTeamsActivityImportEdit_view", recipe, neon.OPERATINGSTATE_VIEW);
--- a/entity/AddAttributesToSelection_entity/AddAttributesToSelection_entity.aod
+++ b/entity/AddAttributesToSelection_entity/AddAttributesToSelection_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.22" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.22">
  <name>AddAttributesToSelection_entity</name>
+  <title>Set attribute</title>
  <majorModelMode>DISTRIBUTED</majorModelMode>
  <documentation>%aditoprj%/entity/AddAttributesToSelection_entity/documentation.adoc</documentation>
  <recordContainer>jDito</recordContainer>
@@ -14,9 +15,11 @@
    </entityProvider>
    <entityField>
      <name>UID</name>
+      <state>INVISIBLE</state>
    </entityField>
    <entityField>
      <name>affectedData</name>
+      <title>Affected rows</title>
      <state>DISABLED</state>
      <displayValueProcess>%aditoprj%/entity/AddAttributesToSelection_entity/entityfields/affecteddata/displayValueProcess.js</displayValueProcess>
    </entityField>

--- a/entity/AddAttributesToSelection_entity/entityfields/affecteddata/displayValueProcess.js
+++ b/entity/AddAttributesToSelection_entity/entityfields/affecteddata/displayValueProcess.js
@@ -2,4 +2,4 @@ import("system.vars");
 import("system.translate");
 import("system.result");

-result.string(translate.text("affected rows:") + " " + parseInt(vars.get("$param.Datalength_param"), "#0"));
\ No newline at end of file
+result.string(parseInt(vars.get("$param.Datalength_param"), "#0"));
\ No newline at end of file
--- a/entity/AddAttributesToSelection_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/AddAttributesToSelection_entity/recordcontainers/jdito/contentProcess.js
@@ -3,5 +3,5 @@ import("system.vars");

 if(vars.get("$local.idvalues"))
 {
-result.object([vars.get("$local.idvalues")]);
+    result.object([vars.get("$local.idvalues")]);
 }
\ No newline at end of file
--- a/entity/Address_entity/Address_entity.aod
+++ b/entity/Address_entity/Address_entity.aod
@@ -4,6 +4,7 @@
  <title>Address</title>
  <majorModelMode>DISTRIBUTED</majorModelMode>
  <documentation>%aditoprj%/entity/Address_entity/documentation.adoc</documentation>
+  <grantDeleteProcess>%aditoprj%/entity/Address_entity/grantDeleteProcess.js</grantDeleteProcess>
  <contentTitleProcess>%aditoprj%/entity/Address_entity/contentTitleProcess.js</contentTitleProcess>
  <afterOperatingState>%aditoprj%/entity/Address_entity/afterOperatingState.js</afterOperatingState>
  <titlePlural>Addresses</titlePlural>
@@ -12,7 +13,7 @@
    <entityField>
      <name>ADDRESS</name>
      <title>Street</title>
-      <mandatory v="true" />
+      <mandatoryProcess>%aditoprj%/entity/Address_entity/entityfields/address/mandatoryProcess.js</mandatoryProcess>
      <textInputAllowed v="false" />
      <stateProcess>%aditoprj%/entity/Address_entity/entityfields/address/stateProcess.js</stateProcess>
      <titleProcess>%aditoprj%/entity/Address_entity/entityfields/address/titleProcess.js</titleProcess>
@@ -57,7 +58,7 @@
      <name>CITY</name>
      <documentation>%aditoprj%/entity/Address_entity/entityfields/city/documentation.adoc</documentation>
      <title>City</title>
-      <mandatory v="true" />
+      <mandatoryProcess>%aditoprj%/entity/Address_entity/entityfields/city/mandatoryProcess.js</mandatoryProcess>
      <stateProcess>%aditoprj%/entity/Address_entity/entityfields/city/stateProcess.js</stateProcess>
      <onValueChange>%aditoprj%/entity/Address_entity/entityfields/city/onValueChange.js</onValueChange>
      <onValueChangeTypes>
@@ -109,7 +110,7 @@
    <entityField>
      <name>ZIP</name>
      <title>Postcode</title>
-      <mandatory v="true" />
+      <mandatoryProcess>%aditoprj%/entity/Address_entity/entityfields/zip/mandatoryProcess.js</mandatoryProcess>
      <stateProcess>%aditoprj%/entity/Address_entity/entityfields/zip/stateProcess.js</stateProcess>
      <onValueChange>%aditoprj%/entity/Address_entity/entityfields/zip/onValueChange.js</onValueChange>
      <onValueChangeTypes>

--- a/entity/Address_entity/entityfields/address/mandatoryProcess.js
+++ b/entity/Address_entity/entityfields/address/mandatoryProcess.js
+import("system.vars");
+import("Entity_lib");
+import("system.result");
+import("AddressEntity_lib");
+
+result.object(AddressEntityValidation.isMandatoryField(vars.get("$field.COUNTRY")));
\ No newline at end of file
--- a/entity/Address_entity/entityfields/addresssearch/valueProcess.js
+++ b/entity/Address_entity/entityfields/addresssearch/valueProcess.js
-import("system.logging");
 import("system.result");
 import("WsValidation_lib");
 import("system.vars");

--- a/entity/Address_entity/entityfields/city/mandatoryProcess.js
+++ b/entity/Address_entity/entityfields/city/mandatoryProcess.js
+import("system.vars");
+import("Entity_lib");
+import("system.result");
+import("AddressEntity_lib");
+
+result.object(AddressEntityValidation.isMandatoryField(vars.get("$field.COUNTRY")));
\ No newline at end of file
--- a/entity/Address_entity/entityfields/zip/mandatoryProcess.js
+++ b/entity/Address_entity/entityfields/zip/mandatoryProcess.js
+import("system.vars");
+import("Entity_lib");
+import("system.result");
+import("AddressEntity_lib");
+
+result.object(AddressEntityValidation.isMandatoryField(vars.get("$field.COUNTRY")));
\ No newline at end of file
--- a/entity/Person_entity/entityfields/salutation/displayValueProcess.js
+++ b/entity/Person_entity/entityfields/salutation/displayValueProcess.js
-import("system.vars");
 import("system.result");
+import("system.vars");
+import("Util_lib");

-if(vars.get("$field.SALUTATION"))
-    result.string(vars.get("$field.SALUTATION"));
\ No newline at end of file
+result.string(!Utils.toBoolean(vars.get("$field.IS_STANDARD")));
\ No newline at end of file
--- a/entity/AdvertisingItem_entity/entityfields/product_id/displayValueProcess.js
+++ b/entity/AdvertisingItem_entity/entityfields/product_id/displayValueProcess.js
+import("system.neon");
+import("Product_lib");
 import("system.vars");
 import("system.result");
 import("Sql_lib");

-if(vars.get("$field.PRODUCT_ID"))
+if(vars.get("$field.PRODUCT_ID") && vars.get("$sys.viewmode") != neon.FRAME_VIEWMODE_TABLE)
 {
-    result.string(newSelect("PRODUCT.PRODUCTNAME").from("PRODUCT").whereIfSet("PRODUCT.PRODUCTID", vars.get("$field.PRODUCT_ID")).cell());
+    result.string(ProductUtils.getProductName(vars.get("$field.PRODUCT_ID")));
 }
\ No newline at end of file