From 9b9aa9a76dda3845119aa3f8b38b8bdc479b6b51 Mon Sep 17 00:00:00 2001 From: Oleh Posyniak <oposyniak@magento.com> Date: Fri, 11 Nov 2016 10:32:45 +0200 Subject: [PATCH] MAGETWO-48516: Most of category fields don't have Use Default Value option in Store/StoreView scope on the redesigned category page --- .../Catalog/Model/Category/DataProvider.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/app/code/Magento/Catalog/Model/Category/DataProvider.php b/app/code/Magento/Catalog/Model/Category/DataProvider.php index a8901f839ad..d0def50ab6b 100644 --- a/app/code/Magento/Catalog/Model/Category/DataProvider.php +++ b/app/code/Magento/Catalog/Model/Category/DataProvider.php @@ -228,15 +228,15 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider */ private function resolveParentInheritance(Category $category, array $meta) { -// if (!$category->getParentId() || !$this->getArrayManager()->findPath('custom_use_parent_settings', $meta)) { -// return $meta; -// } -// -// $meta = $this->getArrayManager()->merge( -// [$this->getArrayManager()->findPath('custom_use_parent_settings', $meta), 'arguments/data/config'], -// $meta, -// ['visible' => false] -// ); + if (!$category->getParentId() || !$this->getArrayManager()->findPath('custom_use_parent_settings', $meta)) { + return $meta; + } + + $meta = $this->getArrayManager()->merge( + [$this->getArrayManager()->findPath('custom_use_parent_settings', $meta), 'arguments/data/config'], + $meta, + ['visible' => false] + ); return $meta; } -- GitLab