From 632dfa048103995f9f63f3ae632d9c5e4ada36fc Mon Sep 17 00:00:00 2001
From: Oleh Posyniak <oposyniak@magento.com>
Date: Fri, 11 Nov 2016 11:07:40 +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 | 2 +-
.../Magento/Ui/view/base/web/js/form/element/file-uploader.js | 1 +
.../base/web/templates/form/element/uploader/uploader.html | 3 ++-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/app/code/Magento/Catalog/Model/Category/DataProvider.php b/app/code/Magento/Catalog/Model/Category/DataProvider.php
index d0def50ab6b..5fb96ce57a2 100644
--- a/app/code/Magento/Catalog/Model/Category/DataProvider.php
+++ b/app/code/Magento/Catalog/Model/Category/DataProvider.php
@@ -194,7 +194,7 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
&& $category->getStoreId();
$attributePath = $this->getArrayManager()->findPath($attributeCode, $meta);
- if (!$attributePath || !$canDisplayUseDefault || $attribute->getFrontendInput() === 'image') {
+ if (!$attributePath || !$canDisplayUseDefault) {
continue;
}
diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/file-uploader.js b/app/code/Magento/Ui/view/base/web/js/form/element/file-uploader.js
index 917dc62f9f4..32ebd40f753 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/element/file-uploader.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/element/file-uploader.js
@@ -72,6 +72,7 @@ define([
this.value(value);
this.on('value', this.onUpdate.bind(this));
+ this.isUseDefault(this.disabled());
return this;
},
diff --git a/app/code/Magento/Ui/view/base/web/templates/form/element/uploader/uploader.html b/app/code/Magento/Ui/view/base/web/templates/form/element/uploader/uploader.html
index 63c34c1a433..ab309026c9f 100644
--- a/app/code/Magento/Ui/view/base/web/templates/form/element/uploader/uploader.html
+++ b/app/code/Magento/Ui/view/base/web/templates/form/element/uploader/uploader.html
@@ -29,5 +29,6 @@
<each args="data: value, as: '$file'" render="$parent.getPreviewTmpl($file)"/>
</div>
+ <render args="$data.service.template" if="$data.hasService()"/>
</div>
-</div>
\ No newline at end of file
+</div>
--
GitLab