Merge branch 'm_1082955_scan_services_warnings' into '2021.1'

[Projekt: xRM-Marketing][TicketNr.: 1082955][Scan Services Warnings beheben.]

See merge request xrm/basic!1094

neonContext/BulkMailAnalysis/BulkMailAnalysis.aod

@@ -12,8 +12,5 @@
       <name>2bdd2e2e-9399-4b4a-a123-2b7a255b9bc0</name>
       <view>BulkMailAnalysisDeviceTypeChart_view</view>
     </neonViewReference>
-    <neonViewReference>
-      <name>5705a355-c092-417e-89ab-8899fd8c82c7</name>
-    </neonViewReference>
   </references>
 </neonContext>

neonView/BulkMailAnalysisDynamicMultiDataChart_view/BulkMailAnalysisDynamicMultiDataChart_view.aod

-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
-  <name>BulkMailAnalysisDynamicMultiDataChart_view</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <layout>
-    <noneLayout>
-      <name>layout</name>
-    </noneLayout>
-  </layout>
-  <children>
-    <dynamicMultiDataChartViewTemplate>
-      <name>dynamicMultiDataChart</name>
-      <defaultGroupFields>
-        <element>year</element>
-      </defaultGroupFields>
-      <columns>
-        <neonDynamicMultiDataChartColumn>
-          <name>c612bd68-b0a9-4517-bd77-4b643c8cc8d8</name>
-        </neonDynamicMultiDataChartColumn>
-        <neonDynamicMultiDataChartColumn>
-          <name>90eb7fd9-e79a-47af-9951-a2ade5353a5a</name>
-        </neonDynamicMultiDataChartColumn>
-      </columns>
-    </dynamicMultiDataChartViewTemplate>
-  </children>
-</neonView>

neonView/BulkMailScoreCard_view/BulkMailScoreCard_view.aod

-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
-  <name>BulkMailScoreCard_view</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <layout>
-    <noneLayout>
-      <name>layout</name>
-    </noneLayout>
-  </layout>
-  <children>
-    <scoreCardViewTemplate>
-      <name>Keyfigures</name>
-    </scoreCardViewTemplate>
-  </children>
-</neonView>

process/DocumentTemplate_lib/process.js

@@ -227,6 +227,7 @@ DocumentTemplate.types = {
     {
         switch (pMimetype)
         {
+            case MimeTypes.XHTML():
             case MimeTypes.HTML():
                 return this.HTML;
             case MimeTypes.EML():

process/SetCommunicationSetting_workflowService/process.js

@@ -40,21 +40,27 @@ if (settingsId)
 }
 else
 {
+    var currentDate = vars.get("$sys.date");
     settingsId = util.getNewUUID();
     new SqlBuilder()
         .tableName("COMMUNICATIONSETTINGS")
         .insertFields({
+            "CONTACT_ID":contactId,
             "COMMUNICATIONSETTINGSID": settingsId,
             "CHANNEL_TYPE": channelType,
             "CHANNEL_ID": channelId,
             "MEDIUM": medium,
-            "STATUS": status
+            "STATUS": status,
+            "USER_NEW":"workflow",
+            "DATE_NEW":date
         });
     new SqlBuilder()
         .tableName("COMMUNICATIONLEGALBASE")
         .insertFields({
             "COMMUNICATIONLEGALBASEID": util.getNewUUID(),
             "COMMUNICATIONSETTINGS_ID": settingsId,
-            "VERSION": 1
+            "VERSION": 1,
+            "USER_NEW":"workflow",
+            "DATE_NEW":date
         });
 }
\ No newline at end of file

process/redirect_rest/process.js

-import("system.logging");
 import("Workflow_lib");
 import("Util_lib");
 import("system.util");

process/redirect_rest/redirect_rest.aod

@@ -8,6 +8,7 @@
   <loginTypeId>
     <element>internal.none</element>
   </loginTypeId>
+  <jditoWebserviceUser>Admin</jditoWebserviceUser>
   <alias>Data_alias</alias>
   <variants>
     <element>EXECUTABLE</element>