MC-13958: Additional Permissions for Design settings

Author: Oleksandr Gorkun

app/code/Magento/Catalog/Model/Product.php

@@ -904,6 +904,8 @@ public function beforeSave()
             $this->setData('page_layout', $this->getOrigData('page_layout'));
             $this->setData('options_container', $this->getOrigData('options_container'));
             $this->setData('custom_layout_update', $this->getOrigData('custom_layout_update'));
+            $this->setData('custom_design_from', $this->getOrigData('custom_design_from'));
+            $this->setData('custom_design_to', $this->getOrigData('custom_design_to'));
         }
 
         $hasOptions = false;

app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php

@@ -743,8 +743,8 @@ public function setupAttributeMeta(ProductAttributeInterface $attribute, $groupC
         }
 
         //Checking access to design config.
-        $designAttributeCodes = ['custom_design', 'page_layout', 'options_container', 'custom_layout_update'];
-        if (in_array($attributeCode, $designAttributeCodes, true)) {
+        $designDesignGroups = ['design', 'schedule-design-update'];
+        if (in_array($groupCode, $designDesignGroups, true)) {
             if (!$this->auth->isAllowed('Magento_Catalog::edit_product_design')) {
                 $meta = $this->arrayManager->merge(
                     $configPath,

app/code/Magento/Cms/Model/Page/DataProvider.php

@@ -120,6 +120,15 @@ public function getMeta()
                             ]
                         ]
                     ]
+                ],
+                'custom_design_update' => [
+                    'arguments' => [
+                        'data' => [
+                            'config' => [
+                                'disabled' => true
+                            ]
+                        ]
+                    ]
                 ]
             ];
             $meta = array_merge_recursive($meta, $designMeta);

app/code/Magento/Cms/Model/PageRepository.php

@@ -149,12 +149,16 @@ public function save(\Magento\Cms\Api\Data\PageInterface $page)
                     $page->setPageLayout(null);
                     $page->setCustomTheme(null);
                     $page->setCustomLayoutUpdateXml(null);
+                    $page->setCustomThemeTo(null);
+                    $page->setCustomThemeFrom(null);
                 } else {
                     $savedPage = $this->getById($page->getId());
                     $page->setLayoutUpdateXml($savedPage->getLayoutUpdateXml());
                     $page->setPageLayout($savedPage->getPageLayout());
                     $page->setCustomTheme($savedPage->getCustomTheme());
                     $page->setCustomLayoutUpdateXml($savedPage->getCustomLayoutUpdateXml());
+                    $page->setCustomThemeTo($savedPage->getCustomThemeTo());
+                    $page->setCustomThemeFrom($savedPage->getCustomThemeFrom());
                 }
             }