diff options
Diffstat (limited to 'www/js/shows.js')
-rw-r--r-- | www/js/shows.js | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/www/js/shows.js b/www/js/shows.js index 43149c3..1897352 100644 --- a/www/js/shows.js +++ b/www/js/shows.js @@ -258,18 +258,21 @@ Rivendell.ShowView.prototype.uploadProgress = function(upload, file) { } }; -Rivendell.ShowView.prototype.uploadError = function(upload, file, msg) { +Rivendell.ShowView.prototype.uploadError = function(upload, file, msg, xhr, acknowledge) { if (!file.cartNumber) { return; } - var dismiss_button = '<button class="btn btn-info btn-xs">' + - '<span class="glyphicon glyphicon-remove"></span> Ok</button>'; + var responseCode = xhr.status; + var errorString = xhr.statusText; + + //var xmlDoc = $.parseXML(msg); + //var msg = $(xmlDoc); + //var responseCode = msg.find('ResponseCode').text(); + //var errorString = msg.find('ErrorString').text(); + var reason = $('<span>').addClass('label').addClass('label-danger').text(responseCode).after($('<b>').html(' ' + errorString)); - var xmlDoc = $.parseXML(msg); - var msg = $(xmlDoc); - var resp_code = msg.find('ResponseCode').text(); - var err_string = msg.find('ErrorString').text(); - var reason = $('<span>').addClass('label').addClass('label-danger').text(resp_code).after($('<b>').html(' ' + err_string)); + var dismiss_button = '<button class="btn btn-info btn-xs">' + + '<span class="glyphicon glyphicon-remove"></span> Ok</button>'; var $errorRow = $('<tr>') .attr("id", "show-cart-" + file.cartNumber) @@ -283,6 +286,7 @@ Rivendell.ShowView.prototype.uploadError = function(upload, file, msg) { $('button', $errorRow).on('click', function() { var $emptyRow = Rivendell.ShowCartView.renderEmpty(self.model, self, file.cartNumber); $('#show-cart-' + file.cartNumber).replaceWith($emptyRow); + acknowledge(); }); $('#show-cart-' + file.cartNumber).replaceWith($errorRow); |