Merge branch 'master' of linz:/srv/git/lantea

[lantea.git] / js / ui.js

diff --git a/js/ui.js b/js/ui.js
index 1a0e23e94bc711caaf3defb5914f6a0681440b84..60abf40a4b42793f331645f98e9adbc04a6193c0 100644 (file)
--- a/js/ui.js
+++ b/js/ui.js
@@ -512,21 +512,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, aMessage) {
+function reportUploadStatus(aSuccess, aResponse) {

   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 {