diff --git a/app/code/Magento/Catalog/Model/Category/DataProvider.php b/app/code/Magento/Catalog/Model/Category/DataProvider.php index d0def50ab6b3ef852020825ef874f71c295ed078..5fb96ce57a27b74204c1475f7cde6a734fa75135 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 917dc62f9f49b148d58ad62c671eb6fbeeff8beb..32ebd40f75346afb4d2d06cd6f9c4db16950fd4a 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 63c34c1a433129ddf427ecd8104743083a81e98b..ab309026c9ffeb3a8e56816c19994b33d34d4116 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>