From: Robert Kaiser <kairo@kairo.at>
Date: Mon, 20 Nov 2017 18:26:17 +0000 (+0100)
Subject: Merge branch 'master' of linz:/srv/git/lantea
X-Git-Tag: production~22
X-Git-Url: https://git-public.kairo.at//?p=lantea.git;a=commitdiff_plain;h=c53a1969fd519687ca4d581077c8dc3792169bb8;hp=c23c5d4a8f2c0d569cef499923aa4b6526f44f97

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

diff --git a/js/ui.js b/js/ui.js
index 1a0e23e..60abf40 100644
--- a/js/ui.js
+++ b/js/ui.js
@@ -512,21 +512,31 @@ function uploadTrack() {
       if (aStatusCode >= 400) {
         reportUploadStatus(false, aResult);
       }
-      else {
+      else if (aResult["id"]) {
         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";
   }
-  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 {