mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-22 16:36:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 33

ImportHandler: UI for showing maxFileSize error on import

Browse source 
This commit is an integration to f4418149cb.
This commit is contained in:
John McLear 2020-04-14 10:02:21 +00:00
parent 53d8e32ecb
commit c6cb253f76
3 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/node/handler/ImportHandler.js
View file

@ -82,6 +82,12 @@ async function doImport(req, res, padId)
if (err) {
console.warn("Uploading Error: " + err.stack);
}
// I hate doing indexOf here but I can't see anything to use...
if (err.stack.indexOf("maxFileSize") !== -1) {
reject("maxFileSize");
}
reject("uploadFailed");
}
if(!files.file){ // might not be a graceful fix but it works
@ -261,7 +267,7 @@ exports.doImport = function (req, res, padId)
let status = "ok";
doImport(req, res, padId).catch(err => {
// check for known errors and replace the status
if (err == "uploadFailed" || err == "convertFailed" || err == "padHasData") {
if (err == "uploadFailed" || err == "convertFailed" || err == "padHasData" || err == "maxFileSize") {
status = err;
} else {
throw err;