From dd9e8cf217b78baf12da5120fdfc76d869043bfa Mon Sep 17 00:00:00 2001 From: Serhiy Zhovnir Date: Tue, 22 Jan 2019 12:08:07 +0200 Subject: [PATCH 1/4] #20376 Fix issue with file uploading if an upload field is disabled --- .../Ui/view/base/web/js/form/element/file-uploader.js | 6 ++++++ 1 file changed, 6 insertions(+) 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 357571350a268..a871857abfaa9 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 @@ -344,6 +344,12 @@ define([ * @param {Object} data - File data that will be uploaded. */ onBeforeFileUpload: function (e, data) { + if (this.disabled()) { + this.notifyError($t('was not uploaded')); + + return; + } + var file = data.files[0], allowed = this.isFileAllowed(file), target = $(e.target); From 85c4e92c8e2f60a71ab3745ef3056deb6a4d795e Mon Sep 17 00:00:00 2001 From: Serhiy Zhovnir Date: Tue, 22 Jan 2019 22:08:01 +0200 Subject: [PATCH 2/4] #20376 Fixed issue with variables declarations and adjusted the notification message --- app/code/Magento/Ui/i18n/en_US.csv | 3 ++- .../Ui/view/base/web/js/form/element/file-uploader.js | 11 +++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/code/Magento/Ui/i18n/en_US.csv b/app/code/Magento/Ui/i18n/en_US.csv index d51ff98108376..039e28f318176 100644 --- a/app/code/Magento/Ui/i18n/en_US.csv +++ b/app/code/Magento/Ui/i18n/en_US.csv @@ -190,4 +190,5 @@ 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}." -"was not uploaded","was not uploaded" \ No newline at end of file +"was not uploaded","was not uploaded" +"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 a871857abfaa9..ea1cb10fd9eda 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 @@ -344,16 +344,15 @@ define([ * @param {Object} data - File data that will be uploaded. */ onBeforeFileUpload: function (e, data) { - if (this.disabled()) { - this.notifyError($t('was not uploaded')); - - return; - } - var file = data.files[0], 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 d91d0ed3c9d59a412b7131cec8e3601cd87b2fb1 Mon Sep 17 00:00:00 2001 From: Serhiy Zhovnir Date: Wed, 23 Jan 2019 14:05:24 +0200 Subject: [PATCH 3/4] #20376 Fixed code style issue & added empty line before the return --- .../Magento/Ui/view/base/web/js/form/element/file-uploader.js | 1 + 1 file changed, 1 insertion(+) 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 ea1cb10fd9eda..abf732b8bf7e7 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 @@ -350,6 +350,7 @@ define([ if (this.disabled()) { this.notifyError($t('The file upload field is disabled.')); + return; } From 3671bbe7ac374e9bdb7c1957479a06369d0f0952 Mon Sep 17 00:00:00 2001 From: Serhiy Zhovnir Date: Thu, 24 Jan 2019 15:53:06 +0200 Subject: [PATCH 4/4] #20376 Fix code style issue --- .../Magento/Ui/view/base/web/js/form/element/file-uploader.js | 2 +- 1 file changed, 1 insertion(+), 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 abf732b8bf7e7..2c5bc1159dd3a 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 @@ -350,7 +350,7 @@ define([ if (this.disabled()) { this.notifyError($t('The file upload field is disabled.')); - + return; }