From 15fdb0ef0695b8a5cce1df324008f902746739e6 Mon Sep 17 00:00:00 2001
From: Oleh Posyniak <oposyniak@magento.com>
Date: Mon, 14 Nov 2016 17:53:37 +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
---
app/code/Magento/Catalog/Model/Category/DataProvider.php | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/app/code/Magento/Catalog/Model/Category/DataProvider.php b/app/code/Magento/Catalog/Model/Category/DataProvider.php
index a2935d502d8..8aa7216a6b6 100644
--- a/app/code/Magento/Catalog/Model/Category/DataProvider.php
+++ b/app/code/Magento/Catalog/Model/Category/DataProvider.php
@@ -176,8 +176,13 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
{
$meta = parent::getMeta();
$meta = $this->prepareMeta($meta);
- $meta = $this->addUseDefaultValueCheckbox($this->getCurrentCategory(), $meta);
- $meta = $this->resolveParentInheritance($this->getCurrentCategory(), $meta);
+
+ $category = $this->getCurrentCategory();
+
+ if ($category) {
+ $meta = $this->addUseDefaultValueCheckbox($category, $meta);
+ $meta = $this->resolveParentInheritance($category, $meta);
+ }
return $meta;
}
--
GitLab