MC-13958: Additional Permissions for Design settings

Author: Oleksandr Gorkun

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

@@ -948,12 +948,14 @@ public function beforeSave()
             )
             && !$this->authorization->isAllowed('Magento_Catalog::edit_category_design')
         ) {
-            $this->setData('custom_design', $this->getOrigData('custom_design'));
-            $this->setData('custom_design_from', $this->getOrigData('custom_design_from'));
-            $this->setData('custom_design_to', $this->getOrigData('custom_design_to'));
-            $this->setData('page_layout', $this->getOrigData('page_layout'));
-            $this->setData('custom_layout_update', $this->getOrigData('custom_layout_update'));
-            $this->setData('custom_apply_to_products', $this->getOrigData('custom_apply_to_products'));
+            $this->getCustomAttributes();
+            foreach ($this->_designAttributes as $attributeCode) {
+                $this->setData($attributeCode, $value = $this->getOrigData($attributeCode));
+                if (array_key_exists($attributeCode, $this->_data[self::CUSTOM_ATTRIBUTES])) {
+                    //In case custom attribute were used to update the entity.
+                    $this->_data[self::CUSTOM_ATTRIBUTES][$attributeCode]->setValue($value);
+                }
+            }
         }
 
         return parent::beforeSave();

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

@@ -104,9 +104,6 @@ public function save(\Magento\Catalog\Api\Data\CategoryInterface $category)
                 }
             }
         } else {
-            //Clearing all redundant data and using only properly extracted data for the entity.
-            /** @var Category $category */
-            $category = $this->categoryFactory->create();
             $parentId = $category->getParentId() ?: $this->storeManager->getStore()->getRootCategoryId();
             $parentCategory = $this->get($parentId, $storeId);
             $existingData['path'] = $parentCategory->getPath();

dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryRepositoryTest.php

@@ -85,7 +85,8 @@ public function testSaveDesign()
 
         $category->setCustomAttribute('custom_design', 2);
         $category = $this->repo->save($category);
-        $this->assertEmpty($category->getCustomAttribute('custom_design'));
+        $customDesignAttribute = $category->getCustomAttribute('custom_design');
+        $this->assertTrue(!$customDesignAttribute || !$customDesignAttribute->getValue());
 
         //Admin has access to category' design.
         $this->aclBuilder->getAcl()
@@ -105,6 +106,7 @@ public function testSaveDesign()
         $this->aclBuilder->getAcl()->deny(null, 'Magento_Catalog::edit_category_design');
         $newCategory->setCustomAttribute('custom_design', 2);
         $newCategory = $this->repo->save($newCategory);
-        $this->assertEmpty($newCategory->getCustomAttribute('custom_design'));
+        $customDesignAttribute = $newCategory->getCustomAttribute('custom_design');
+        $this->assertTrue(!$customDesignAttribute || !$customDesignAttribute->getValue());
     }
 }