From dd78e93244833e574eeb1474df6d5668e7f19ead Mon Sep 17 00:00:00 2001 From: Oleh Posyniak <oposyniak@magento.com> Date: Fri, 11 Nov 2016 17:15:25 +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 | 17 ++++++----------- .../adminhtml/ui_component/category_form.xml | 13 ------------- 2 files changed, 6 insertions(+), 24 deletions(-) diff --git a/app/code/Magento/Catalog/Model/Category/DataProvider.php b/app/code/Magento/Catalog/Model/Category/DataProvider.php index 2a8ab2c4de3..5646eec6070 100644 --- a/app/code/Magento/Catalog/Model/Category/DataProvider.php +++ b/app/code/Magento/Catalog/Model/Category/DataProvider.php @@ -197,7 +197,12 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider && $category->getStoreId(); $attributePath = $this->getArrayManager()->findPath($attributeCode, $meta); - if (!$attributePath || !$canDisplayUseDefault) { + if ( + !$attributePath + || !$canDisplayUseDefault + || in_array($attributeCode, $this->elementsWithUseConfigSetting + ) + ) { continue; } @@ -494,15 +499,6 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider $result['use_config.available_sort_by']['default'] = true; $result['use_config.default_sort_by']['default'] = true; $result['use_config.filter_price_range']['default'] = true; - if ($this->request->getParam('store') && $this->request->getParam('id')) { - $result['use_default.url_key']['checked'] = true; - $result['use_default.url_key']['default'] = true; - $result['use_default.url_key']['visible'] = true; - } else { - $result['use_default.url_key']['checked'] = false; - $result['use_default.url_key']['default'] = false; - $result['use_default.url_key']['visible'] = false; - } return $result; } @@ -542,7 +538,6 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider [ 'url_key', 'url_key_create_redirect', - 'use_default.url_key', 'url_key_group', 'meta_title', 'meta_keywords', diff --git a/app/code/Magento/Catalog/view/adminhtml/ui_component/category_form.xml b/app/code/Magento/Catalog/view/adminhtml/ui_component/category_form.xml index 049ead82f31..4b99707b85f 100644 --- a/app/code/Magento/Catalog/view/adminhtml/ui_component/category_form.xml +++ b/app/code/Magento/Catalog/view/adminhtml/ui_component/category_form.xml @@ -375,19 +375,6 @@ <item name="source" xsi:type="string">category</item> <item name="label" xsi:type="string" translate="true">URL Key</item> <item name="sortOrder" xsi:type="number">10</item> - <item name="imports" xsi:type="array"> - <item name="disabled" xsi:type="string">${ $.provider }:data.use_default.url_key</item> - </item> - </item> - </argument> - </field> - <field name="use_default.url_key"> - <argument name="data" xsi:type="array"> - <item name="config" xsi:type="array"> - <item name="description" xsi:type="string" translate="true">Use Default</item> - <item name="dataType" xsi:type="string">boolean</item> - <item name="formElement" xsi:type="string">checkbox</item> - <item name="sortOrder" xsi:type="number">20</item> </item> </argument> </field> -- GitLab