MAGETWO-49767: Merchant can't save & continue editing the Design Configuration

Author: Oleksandr Karpenko

app/code/Magento/Theme/Block/Adminhtml/Design/Config/Edit/SaveAndContinueButton.php

@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Theme\Block\Adminhtml\Design\Config\Edit;
+
+use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
+
+class SaveAndContinueButton implements ButtonProviderInterface
+{
+
+    /**
+     * @return array
+     */
+    public function getButtonData()
+    {
+        return [
+            'label' => __('Save and Continue'),
+            'class' => 'save',
+            'data_attribute' => [
+                'mage-init' => [
+                    'button' => ['event' => 'saveAndContinue'],
+                ],
+                'form-role' => 'saveAndContinue'
+            ],
+            'sort_order' => 15,
+        ];
+    }
+}

app/code/Magento/Theme/Block/Adminhtml/Design/Config/Edit/SaveButton.php

@@ -15,7 +15,7 @@ class SaveButton implements ButtonProviderInterface
     public function getButtonData()
     {
         return [
-            'label' => __('Save'),
+            'label' => __('Save Configuration'),
             'class' => 'save primary',
             'data_attribute' => [
                 'mage-init' => ['button' => ['event' => 'save']],

app/code/Magento/Theme/Controller/Adminhtml/Design/Config/Save.php

@@ -74,7 +74,11 @@ public function execute()
 
             $this->dataPersistor->clear('theme_design_config');
 
+            $returnToEdit = (bool)$this->getRequest()->getParam('back', false);
             $resultRedirect->setPath('theme/design_config/');
+            if ($returnToEdit) {
+                $resultRedirect->setPath('theme/design_config/edit', ['scope' => $scope, 'scope_id' => $scopeId]);
+            }
             return $resultRedirect;
         } catch (LocalizedException $e) {
             $messages = explode("\n", $e->getMessage());

app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/Design/Config/SaveTest.php

@@ -112,15 +112,17 @@ public function testSave()
         $this->redirectFactory->expects($this->once())
             ->method('create')
             ->willReturn($this->redirect);
-        $this->request->expects($this->exactly(2))
+        $this->request->expects($this->exactly(3))
             ->method('getParam')
             ->withConsecutive(
                 ['scope'],
-                ['scope_id']
+                ['scope_id'],
+                ['back', false]
             )
             ->willReturnOnConsecutiveCalls(
                 $scope,
-                $scopeId
+                $scopeId,
+                true
             );
         $this->request->expects($this->once())
             ->method('getParams')
@@ -150,9 +152,12 @@ public function testSave()
         $this->dataPersistor->expects($this->once())
             ->method('clear')
             ->with('theme_design_config');
-        $this->redirect->expects($this->once())
+        $this->redirect->expects($this->exactly(2))
             ->method('setPath')
-            ->with('theme/design_config/');
+            ->withConsecutive(
+                ['theme/design_config/'],
+                ['theme/design_config/edit', ['scope' => $scope, 'scope_id' => $scopeId]]
+            );
 
         $this->assertSame($this->redirect, $this->controller->execute());
     }

app/code/Magento/Theme/view/adminhtml/ui_component/design_config_form.xml

@@ -20,6 +20,7 @@
         <item name="buttons" xsi:type="array">
             <item name="back" xsi:type="string">Magento\Theme\Block\Adminhtml\Design\Config\Edit\BackButton</item>
             <item name="save" xsi:type="string">Magento\Theme\Block\Adminhtml\Design\Config\Edit\SaveButton</item>
+            <item name="save_and_continue" xsi:type="string">Magento\Theme\Block\Adminhtml\Design\Config\Edit\SaveAndContinueButton</item>
         </item>
     </argument>
     <dataSource name="design_config_form_data_source">