diff options
Diffstat (limited to 'www/js/shows.js')
-rw-r--r-- | www/js/shows.js | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/www/js/shows.js b/www/js/shows.js index 7dc94d3..ccea2e5 100644 --- a/www/js/shows.js +++ b/www/js/shows.js @@ -252,6 +252,9 @@ Rdxport.ShowView.prototype.render = function() { var upload = importer.getUploadByCartNumber(log.cartNumber); if (upload) { $('#app-shows table > tbody').append(Rdxport.ShowCartView.renderUploading(upload)); + if (upload.error) { + self.uploadError(upload); + } } else if (cart) { var cartView = new Rdxport.ShowCartView(cart, self); self.cartViews.push(cartView); @@ -264,7 +267,10 @@ Rdxport.ShowView.prototype.render = function() { }; Rdxport.ShowView.prototype.uploadProgress = function(upload) { - var $cart = $('tr[data-upload-id="' + upload.uploadId + '"]').first(); + if (!upload.uploadId) { + return; + } + var $cart = $('tr[data-upload-id="' + upload.uploadId + '"]', this.$el).first(); if (!$cart.hasClass('uploading')) { var $progressBar = $('.progressBarTemplate.shows').clone().removeClass('progressBarTemplate'); $cart.html($progressBar.html()); @@ -285,8 +291,8 @@ Rdxport.ShowView.prototype.uploadProgress = function(upload) { updateProgressBar($cart, upload); }; -Rdxport.ShowView.prototype.uploadError = function(upload, status, errorString, acknowledge) { - var reason = $('<span>').addClass('label').addClass('label-danger').text(status).after($('<b>').text(' ' + errorString)); +Rdxport.ShowView.prototype.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> Ok</button>'; @@ -307,10 +313,11 @@ Rdxport.ShowView.prototype.uploadError = function(upload, status, errorString, a } $('button', $errorRow).off('click').on('click', function() { - acknowledge(); + upload.close(); }); - var $cart = $('tr[data-upload-id="' + upload.uploadId + '"]').first(); + var $cart = $('tr[data-upload-id="' + upload.uploadId + '"]', this.$el).first(); + console.log($('tr')); $cart.replaceWith($errorRow); }; @@ -370,6 +377,7 @@ Rdxport.ShowCartView.renderUploading = function(upload) { }); updateProgressBar($el, upload); + return $el; }; |