projects
/
lantea.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1c056e7
)
improve error handling, actually print the error message if one is sent
author
Robert Kaiser
<kairo@kairo.at>
Mon, 20 Nov 2017 18:26:09 +0000
(19:26 +0100)
committer
Robert Kaiser
<kairo@kairo.at>
Mon, 20 Nov 2017 18:26:09 +0000
(19:26 +0100)
js/ui.js
patch
|
blob
|
blame
|
history
diff --git
a/js/ui.js
b/js/ui.js
index f451fbe52932ec53f900bcd15943431e99b49d76..263a139387e3ff37a45b43e290cca2cbced159e0 100644
(file)
--- a/
js/ui.js
+++ b/
js/ui.js
@@
-527,21
+527,31
@@
function uploadTrack() {
if (aStatusCode >= 400) {
reportUploadStatus(false, aResult);
}
if (aStatusCode >= 400) {
reportUploadStatus(false, aResult);
}
- else {
+ else
if (aResult["id"])
{
reportUploadStatus(true);
}
reportUploadStatus(true);
}
+ else { // If no ID is returned, we assume a general error.
+ reportUploadStatus(false);
+ }
}
);
}
}
);
}
-function reportUploadStatus(aSuccess, a
Messag
e) {
+function reportUploadStatus(aSuccess, a
Respons
e) {
document.getElementById("uploadStatusCloseButton").disabled = false;
document.getElementById("uploadInProgress").style.display = "none";
if (aSuccess) {
document.getElementById("uploadSuccess").style.display = "block";
}
document.getElementById("uploadStatusCloseButton").disabled = false;
document.getElementById("uploadInProgress").style.display = "none";
if (aSuccess) {
document.getElementById("uploadSuccess").style.display = "block";
}
- else if (aMessage) {
- document.getElementById("uploadErrorMsg").textContent = aMessage;
+ else if (aResponse["message"]) {
+ document.getElementById("uploadErrorMsg").textContent = aResponse["message"];
+ if (aResponse["errortype"]) {
+ document.getElementById("uploadErrorMsg").textContent += " (" + aResponse["errortype"] + ")";
+ }
+ document.getElementById("uploadError").style.display = "block";
+ }
+ else if (aResponse) {
+ document.getElementById("uploadErrorMsg").textContent = aResponse;
document.getElementById("uploadError").style.display = "block";
}
else {
document.getElementById("uploadError").style.display = "block";
}
else {