From 02af8bb25434ae77c50975a66abe2199cd5ca9ac Mon Sep 17 00:00:00 2001 From: Luke Towers Date: Fri, 5 Jun 2020 15:56:15 -0600 Subject: [PATCH] Improve error handling when uploading a file that exceeds the server's post_max_size --- .../widgets/mediamanager/assets/js/mediamanager-browser-min.js | 3 ++- modules/backend/widgets/mediamanager/assets/js/mediamanager.js | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/backend/widgets/mediamanager/assets/js/mediamanager-browser-min.js b/modules/backend/widgets/mediamanager/assets/js/mediamanager-browser-min.js index 0dd0f8c07..cef2f0fd7 100644 --- a/modules/backend/widgets/mediamanager/assets/js/mediamanager-browser-min.js +++ b/modules/backend/widgets/mediamanager/assets/js/mediamanager-browser-min.js @@ -313,7 +313,8 @@ this.hideUploadUi()} MediaManager.prototype.updateUploadBar=function(templateName,classNames){var fileNumberLabel=this.$el.get(0).querySelector('[data-label="file-number-and-progress"]'),successTemplate=fileNumberLabel.getAttribute('data-'+templateName+'-template'),progressBar=this.$el.get(0).querySelector('[data-control="upload-progress-bar"]') fileNumberLabel.innerHTML=successTemplate;progressBar.setAttribute('class',classNames)} MediaManager.prototype.uploadSuccess=function(){this.updateUploadBar('success','progress-bar progress-bar-success');} -MediaManager.prototype.uploadError=function(file,message){this.updateUploadBar('error','progress-bar progress-bar-danger');if(!message){message='Error uploading file'} +MediaManager.prototype.uploadError=function(file,message){this.updateUploadBar('error','progress-bar progress-bar-danger');if(file.xhr.status===413){message='Server rejected the file because it was too large, try increasing post_max_size';} +if(!message){message='Error uploading file'} $.oc.alert(message)} MediaManager.prototype.cropSelectedImage=function(callback){var selectedItems=this.getSelectedItems(true) if(selectedItems.length!=1){alert(this.options.selectSingleImage) diff --git a/modules/backend/widgets/mediamanager/assets/js/mediamanager.js b/modules/backend/widgets/mediamanager/assets/js/mediamanager.js index 6545c3c29..178d91569 100644 --- a/modules/backend/widgets/mediamanager/assets/js/mediamanager.js +++ b/modules/backend/widgets/mediamanager/assets/js/mediamanager.js @@ -820,6 +820,9 @@ MediaManager.prototype.uploadError = function(file, message) { this.updateUploadBar('error', 'progress-bar progress-bar-danger'); + if (file.xhr.status === 413) { + message = 'Server rejected the file because it was too large, try increasing post_max_size'; + } if (!message) { message = 'Error uploading file' }