Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#20376 Fix issue with file uploading if an upload field is disabled #20461

Merged
merged 5 commits into from
Feb 13, 2019
Merged

#20376 Fix issue with file uploading if an upload field is disabled #20461

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dd9e8cf
#20376 Fix issue with file uploading if an upload field is disabled
Jan 22, 2019
85c4e92
#20376 Fixed issue with variables declarations and adjusted the notif…
Jan 22, 2019
d91d0ed
#20376 Fixed code style issue & added empty line before the return
Jan 23, 2019
3671bbe
#20376 Fix code style issue
Jan 24, 2019
b0363af
Merge remote-tracking branch 'mainline/2.3-develop' into issue-20376-…
nmalevanec Feb 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion app/code/Magento/Ui/i18n/en_US.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
"was not uploaded","was not uploaded"
"The file upload field is disabled.","The file upload field is disabled."
5 changes: 5 additions & 0 deletions app/code/Magento/Ui/view/base/web/js/form/element/file-uploader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,11 @@ 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);
Expand Down