From b9390c9f3a5d9be797a460a0e4d09d9932d70910 Mon Sep 17 00:00:00 2001 From: Serhiy Zhovnir Date: Sat, 26 Jan 2019 19:06:54 +0200 Subject: [PATCH 1/2] #20376 Fix issue with file uploading if an upload field is disabled --- app/code/Magento/Ui/i18n/en_US.csv | 1 + .../Ui/view/base/web/js/form/element/file-uploader.js | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/app/code/Magento/Ui/i18n/en_US.csv b/app/code/Magento/Ui/i18n/en_US.csv index 981d444b31d53..040ec32cf0b74 100644 --- a/app/code/Magento/Ui/i18n/en_US.csv +++ b/app/code/Magento/Ui/i18n/en_US.csv @@ -202,3 +202,4 @@ CSV,CSV "Please enter at least {0} characters.","Please enter at least {0} characters." "Please enter a value between {0} and {1} characters long.","Please enter a value between {0} and {1} characters long." "Please enter a value between {0} and {1}.","Please enter a value between {0} and {1}." +"The file upload field is disabled.","The file upload field is disabled." 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 b81119f2bd5f3..1d7023e50b042 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 @@ -328,6 +328,12 @@ define([ allowed = this.isFileAllowed(file), target = $(e.target); + if (this.disabled()) { + this.notifyError($t('The file upload field is disabled.')); + + return; + } + if (allowed.passed) { target.on('fileuploadsend', function (event, postData) { postData.data.append('param_name', this.paramName); From 0b24b39b12e34dfc7ac60746caf420abbd3c2b76 Mon Sep 17 00:00:00 2001 From: Serhiy Zhovnir Date: Sat, 26 Jan 2019 19:23:38 +0200 Subject: [PATCH 2/2] #20461 Add translate component --- .../Magento/Ui/view/base/web/js/form/element/file-uploader.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 1d7023e50b042..4b178622c28cf 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 @@ -13,8 +13,9 @@ define([ 'Magento_Ui/js/modal/alert', 'Magento_Ui/js/lib/validation/validator', 'Magento_Ui/js/form/element/abstract', + 'mage/translate', 'jquery/file-uploader' -], function ($, _, utils, uiAlert, validator, Element) { +], function ($, _, utils, uiAlert, validator, Element, $t) { 'use strict'; return Element.extend({