Merge remote-tracking branch 'tango/MAGETWO-43285' into SWAT-BugFixes-11Oct

Author: arkadiych

app/code/Magento/Cms/Block/Adminhtml/Page/Edit/Tab/Design.php

@@ -156,10 +156,10 @@ protected function _prepareForm()
         );
 
         $designFieldset->addField(
-            'custom_page_layout',
+            'custom_root_template',
             'select',
             [
-                'name' => 'custom_page_layout',
+                'name' => 'custom_root_template',
                 'label' => __('Custom Layout'),
                 'values' => $this->pageLayoutBuilder->getPageLayoutsConfig()->toOptionArray(true),
                 'disabled' => $isElementDisabled

app/code/Magento/Cms/Controller/Adminhtml/Page/InlineEdit.php

@@ -66,7 +66,7 @@ public function execute()
             /** @var \Magento\Cms\Model\Page $page */
             $page = $this->pageRepository->getById($pageId);
             try {
-                $pageData = $this->dataProcessor->filter($postItems[$pageId]);
+                $pageData = $this->filterPost($postItems[$pageId]);
                 $this->validatePost($pageData, $page, $error, $messages);
                 $extendedPageData = $page->getData();
                 $this->setCmsPageData($page, $extendedPageData, $pageData);
@@ -92,6 +92,22 @@ public function execute()
         ]);
     }
 
+    /**
+     * Filtering posted data.
+     *
+     * @param array $postData
+     * @return array
+     */
+    protected function filterPost($postData = [])
+    {
+        $pageData = $this->dataProcessor->filter($postData);
+        $pageData['custom_theme'] = isset($pageData['custom_theme']) ? $pageData['custom_theme'] : null;
+        $pageData['custom_root_template'] = isset($pageData['custom_root_template'])
+            ? $pageData['custom_root_template']
+            : null;
+        return $pageData;
+    }
+
     /**
      * Validate post data
      *

app/code/Magento/Cms/Model/Page/Source/ThemeFilter.php renamed to app/code/Magento/Cms/Model/Page/Source/CustomLayout.php

@@ -6,15 +6,15 @@
 namespace Magento\Cms\Model\Page\Source;
 
 /**
- * Theme filter source
+ * Custom layout source
  */
-class ThemeFilter extends Theme
+class CustomLayout extends PageLayout
 {
     /**
      * {@inheritdoc}
      */
     public function toOptionArray()
     {
-        return array_merge([['label' => '', 'value' => '']], parent::toOptionArray());
+        return array_merge([['label' => 'Default', 'value' => '']], parent::toOptionArray());
     }
 }

app/code/Magento/Cms/Model/Page/Source/Theme.php

@@ -35,6 +35,7 @@ public function __construct(ListInterface $themeList)
      */
     public function toOptionArray()
     {
-        return $this->themeList->getLabels();
+        $options[] = ['label' => 'Default', 'value' => ''];
+        return array_merge($options, $this->themeList->getLabels());
     }
 }

app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/InlineEditTest.php

@@ -90,7 +90,9 @@ public function prepareMocksForTestExecute()
         $postData = [
             1 => [
                 'title' => '404 Not Found',
-                'identifier' => 'no-route'
+                'identifier' => 'no-route',
+                'custom_theme' => '1',
+                'custom_root_template' => '2'
             ]
         ];
         $this->request->expects($this->any())
@@ -138,7 +140,9 @@ public function prepareMocksForTestExecute()
             ->with([
                 'layout' => '1column',
                 'title' => '404 Not Found',
-                'identifier' => 'no-route'
+                'identifier' => 'no-route',
+                'custom_theme' => '1',
+                'custom_root_template' => '2'
             ]);
         $this->jsonFactory->expects($this->once())
             ->method('create')

app/code/Magento/Cms/Test/Unit/Model/Page/Source/CustomLayoutTest.php

@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Cms\Test\Unit\Model\Page\Source;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+class CustomLayoutTest extends PageLayoutTest
+{
+    /**
+     * @return string
+     */
+    protected function getSourceClassName()
+    {
+        return 'Magento\Cms\Model\Page\Source\CustomLayout';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getOptionsDataProvider()
+    {
+        return [
+            [
+                [],
+                [['label' => 'Default', 'value' => '']],
+            ],
+            [
+                ['testStatus' => 'testValue'],
+                [['label' => 'Default', 'value' => ''], ['label' => 'testValue', 'value' => 'testStatus']],
+            ],
+        ];
+    }
+}

app/code/Magento/Cms/Test/Unit/Model/Page/Source/ThemeFilterTest.php

@@ -62,7 +62,7 @@ public function testToOptionArray(array $options, array $expected)
             ->method('getLabels')
             ->willReturn($options);
 
-        $this->assertSame($expected, $this->object->toOptionArray());
+        $this->assertEquals($expected, $this->object->toOptionArray());
     }
 
     /**
@@ -73,11 +73,11 @@ public function getOptionsDataProvider()
         return [
             [
                 [],
-                [],
+                [['label' => 'Default', 'value' => '']],
             ],
             [
                 [['label' => 'testValue', 'value' => 'testStatus']],
-                [['label' => 'testValue', 'value' => 'testStatus']],
+                [['label' => 'Default', 'value' => ''], ['label' => 'testValue', 'value' => 'testStatus']],
             ],
         ];
     }

app/code/Magento/Cms/Test/Unit/Model/Page/Source/ThemeTest.php

@@ -354,7 +354,7 @@
         </column>
         <column name="custom_root_template">
             <argument name="data" xsi:type="array">
-                <item name="options" xsi:type="object">Magento\Cms\Model\Page\Source\PageLayout</item>
+                <item name="options" xsi:type="object">Magento\Cms\Model\Page\Source\CustomLayout</item>
                 <item name="config" xsi:type="array">
                     <item name="filter" xsi:type="string">select</item>
                     <item name="component" xsi:type="string">Magento_Ui/js/grid/columns/select</item>