NunoSempere/calibre-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Additional fix for #845 (in case of error)

Browse Source
This commit is contained in:
Ozzieisaacs 2019-03-26 18:19:39 +01:00
parent 8923e71220
commit 4b301a7961
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
cps/static/js/uploadprogress.js
View File

@ -130,22 +130,19 @@
this.$modalFooter.show(); this.$modalFooter.show();
var contentType = xhr.getResponseHeader("Content-Type"); var contentType = xhr.getResponseHeader("Content-Type");
// Replace the contents of the form, with the returned html
if (xhr.status === 422) {
var newHtml = $.parseHTML(xhr.responseText);
this.replaceForm(newHtml);
this.$modal.modal("hide");
}
// Write the error response to the document. // Write the error response to the document.
else{ if (contentType || xhr.status === 422) {
// Handle no response error var responseText = xhr.responseText;
if (contentType) { if (contentType.indexOf("text/plain") !== -1) {
var responseText = xhr.responseText; responseText = "<pre>" + responseText + "</pre>";
if (contentType.indexOf("text/plain") !== -1) {
responseText = "<pre>" + responseText + "</pre>";
}
document.write(responseText); document.write(responseText);
} }
else {
this.$modalBar.text(responseText);
}
}
else {
this.$modalBar.text(this.options.modalTitleFailed);
} }
}, },

3
cps/web.py
View File

@ -3778,8 +3778,7 @@ def upload():
try: try:
os.unlink(meta.file_path) os.unlink(meta.file_path)
except OSError: except OSError:
flash(_(u"Failed to delete file %(file)s (Permission denied).", file= meta.file_path), return Response(_(u"Failed to delete file %(file)s (Permission denied).", file= meta.file_path)), 422
category="warning")
if meta.cover is None: if meta.cover is None:
has_cover = 0 has_cover = 0