Merge MC-30944 into 2.4.0-bugfixes-030929

Author: dvoskoboinikov

app/code/Magento/Newsletter/Controller/Adminhtml/Template/Save.php

@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -10,6 +9,9 @@
 use Magento\Framework\App\TemplateTypesInterface;
 use Magento\Framework\Exception\LocalizedException;
 
+/**
+ * An action that saves a template.
+ */
 class Save extends \Magento\Newsletter\Controller\Adminhtml\Template implements HttpPostActionInterface
 {
     /**
@@ -32,9 +34,7 @@ public function execute()
         }
 
         try {
-            $template->addData(
-                $request->getParams()
-            )->setTemplateSubject(
+            $template->setTemplateSubject(
                 $request->getParam('subject')
             )->setTemplateCode(
                 $request->getParam('code')

dev/tests/integration/testsuite/Magento/Newsletter/Controller/Adminhtml/NewsletterTemplateTest.php

@@ -62,11 +62,19 @@ protected function tearDown()
     public function testSaveActionCreateNewTemplateAndVerifySuccessMessage()
     {
         $this->getRequest()->setParam('id', $this->model->getId());
+        $this->getRequest()->setParam('is_legacy', 1);
+
         $this->dispatch('backend/newsletter/template/save');
+
         /**
          * Check that errors was generated and set to session
          */
         $this->assertSessionMessages($this->isEmpty(), \Magento\Framework\Message\MessageInterface::TYPE_ERROR);
+
+        $this->model->load($this->getRequest()->getPostValue('code'), 'template_code');
+
+        $this->assertEquals(0, $this->model->getIsLegacy());
+
         /**
          * Check that success message is set
          */
@@ -90,13 +98,19 @@ public function testSaveActionEditTemplateAndVerifySuccessMessage()
         $this->assertEquals('some_unique_code', $this->model->getTemplateCode());
 
         $this->getRequest()->setParam('id', $this->model->getId());
+        $this->getRequest()->setParam('is_legacy', 1);
+
         $this->dispatch('backend/newsletter/template/save');
 
         /**
          * Check that errors was generated and set to session
          */
         $this->assertSessionMessages($this->isEmpty(), \Magento\Framework\Message\MessageInterface::TYPE_ERROR);
 
+        $this->model->load($this->getRequest()->getPostValue('code'), 'template_code');
+
+        $this->assertEquals(0, $this->model->getIsLegacy());
+
         /**
          * Check that success message is set
          */