Merge branch '1064083_FixBulkmailDifferentPreviews' into '2020.2.0'

[Projekt: Entwicklung - Neon][TicketNr.: 1064083][[Serienmail] Unterschiedliche Preview]

See merge request xrm/basic!385

neonContext/BulkMail/BulkMail.aod

@@ -29,9 +29,5 @@
       <name>6b057fb0-94ac-4bca-88b2-c97fdfcf9d6e</name>
       <view>BulkMailContent_view</view>
     </neonViewReference>
-    <neonViewReference>
-      <name>fb5bc6ed-d3c9-45ef-a0c7-17b190e3ce74</name>
-      <view>BulkMailMainPreview_view</view>
-    </neonViewReference>
   </references>
 </neonContext>

neonView/BulkMailMainPreview_view/BulkMailMainPreview_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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
-  <name>BulkMailMainPreview_view</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <layout>
-    <headerFooterLayout>
-      <name>layout</name>
-      <footer>e8f0200f-3447-4196-8aba-f2966e83689a</footer>
-    </headerFooterLayout>
-  </layout>
-  <children>
-    <neonViewReference>
-      <name>2a1f719c-1838-4f30-8fb7-27cd7bbf16ee</name>
-      <entityField>#ENTITY</entityField>
-      <view>BulkMailPreview_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>e8f0200f-3447-4196-8aba-f2966e83689a</name>
-      <entityField>RecipientStatusChart</entityField>
-      <view>BulkMailStatusChart_view</view>
-    </neonViewReference>
-  </children>
-</neonView>

neonView/BulkMailMain_view/BulkMailMain_view.aod

@@ -5,7 +5,7 @@
   <layout>
     <masterSlaveLayout>
       <name>layout</name>
-      <master>3f7fc7d4-7cda-428c-8acb-364addc5239c</master>
+      <master>9dd4620e-2945-4f14-8e22-443812056001</master>
     </masterSlaveLayout>
   </layout>
   <children>
@@ -30,9 +30,9 @@
       <view>LogHistoryFilter_view</view>
     </neonViewReference>
     <neonViewReference>
-      <name>3f7fc7d4-7cda-428c-8acb-364addc5239c</name>
+      <name>9dd4620e-2945-4f14-8e22-443812056001</name>
       <entityField>#ENTITY</entityField>
-      <view>BulkMailMainPreview_view</view>
+      <view>BulkMailPreview_view</view>
     </neonViewReference>
   </children>
 </neonView>

neonView/BulkMailPreview_view/BulkMailPreview_view.aod

@@ -69,5 +69,10 @@
         </entityFieldLink>
       </fields>
     </genericViewTemplate>
+    <neonViewReference>
+      <name>23ab3cb7-2d15-467d-8bd1-536ddd6262c7</name>
+      <entityField>RecipientStatusChart</entityField>
+      <view>BulkMailStatusChart_view</view>
+    </neonViewReference>
   </children>
 </neonView>