1 files changed, 14 insertions, 3 deletions
diff --git a/www/js/jingles.js b/www/js/jingles.js
index 3475faf..6457b5a 100644
--- a/www/js/jingles.js
+++ b/www/js/jingles.js
@@ -117,6 +117,9 @@ Rdxport.JingleGroupView.prototype.destroy = function() {
 };
 
 Rdxport.JingleGroupView.prototype.uploadProgress = function(upload) {
+  if (!upload.uploadId) {
+    return;
+  }
   var $cut = $('tr[data-upload-id="' + upload.uploadId + '"]').first();
   if (!$cut.hasClass('uploading')) {
     var $progressBar = $('.progressBarTemplate.jingles').clone().removeClass('progressBarTemplate');
@@ -138,8 +141,13 @@ Rdxport.JingleGroupView.prototype.uploadProgress = function(upload) {
   updateProgressBar($cut, upload);
 };
 
-Rdxport.JingleGroupView.prototype.uploadError = function(upload, status, errorString, acknowledge) {
-  var reason = $('<span>').addClass('label').addClass('label-danger').text(status).after($('<b>').text(' ' + errorString));
+
+Rdxport.JingleGroupView.prototype.uploadError = function(upload) {
+  Rdxport.JingleGroupView.uploadError(upload);
+};
+
+Rdxport.JingleGroupView.uploadError = function(upload) {
+  var reason = $('<span>').addClass('label').addClass('label-danger').text(upload.errorStatus).after($('<b>').text(' ' + upload.errorString));
 
   var dismiss_button = '<button class="btn btn-info btn-xs">' +
     '<span class="glyphicon glyphicon-remove"></span>&nbsp;&nbsp;Ok</button>';
@@ -164,7 +172,7 @@ Rdxport.JingleGroupView.prototype.uploadError = function(upload, status, errorSt
   }
 
   $('button', $errorRow).on('click', function() {
-    acknowledge();
+    upload.close();
   });
 
   var $cart = $('tr[data-upload-id="' + upload.uploadId + '"]').first();
@@ -192,6 +200,9 @@ Rdxport.JingleCartView = function(model, groupView, active) {
     $(uploads).each(function(index, upload) {
       var $el = Rdxport.JingleCutView.renderUploading(upload, self.model.number);
       $('table > tbody', self.groupView.$el).append($el);
+      if (upload.error) {
+        Rdxport.JingleGroupView.uploadError(upload);
+      }
     });
   }
 };