diff options
author | Peter Grassberger <petertheone@gmail.com> | 2016-02-22 17:21:52 (GMT) |
---|---|---|
committer | Peter Grassberger <petertheone@gmail.com> | 2016-02-22 17:21:52 (GMT) |
commit | 7262a8e91ca8bb14bf58af8f8cf89e351aff288e (patch) | |
tree | 22fef7f2e770da0933f2f59483def62e50c4367c /www/js/jingles.js | |
parent | 212c8cfbdaa51855ce8ec4f41f0b6bcf34373387 (diff) |
show import error in jingles and musicpools
Diffstat (limited to 'www/js/jingles.js')
-rw-r--r-- | www/js/jingles.js | 41 |
1 files changed, 38 insertions, 3 deletions
diff --git a/www/js/jingles.js b/www/js/jingles.js index 0bb586c..ea010d0 100644 --- a/www/js/jingles.js +++ b/www/js/jingles.js @@ -148,10 +148,38 @@ Rivendell.JingleGroupView.prototype.uploadProgress = function(upload, file) { }; Rivendell.JingleGroupView.prototype.uploadError = function(upload, file, msg, xhr, acknowledge) { - // todo + if (!file.cartNumber || !file.cutNumber) { + return; + } + 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 dismiss_button = '<button class="btn btn-info btn-xs">' + + '<span class="glyphicon glyphicon-remove"></span> Ok</button>'; + + var status = $('<span class="label"></span>') + .addClass('label-danger').html('<span class="glyphicon glyphicon-fire"></span>'); + + var $errorRow = $('<tr>') + .attr('id', 'jingle-' + file.cartNumber + '-' + file.cutNumber) + .append($('<td>').html(status)) + .append($('<td>').text(file.cartNumber)) + .append($('<td>').addClass('file-name').text(file.name)) + .append($('<td>').append($('<b>').text('Import Fehler'))) + .append($('<td colspan="1">').append(reason)) + .append($('<td>').css('text-align', 'center').append(dismiss_button)); + + $('button', $errorRow).on('click', function() { + acknowledge(); + }); - // to this on ok click. - acknowledge(); + $('#jingle-' + file.cartNumber + '-' + file.cutNumber).replaceWith($errorRow); }; Rivendell.JingleCartView = function(model, groupView, active) { @@ -196,6 +224,13 @@ Rivendell.JingleCutView.prototype.render = function() { } var deleteButton = $('<button class="btn btn-danger btn-xs"><span class="glyphicon glyphicon-trash"></span> Löschen</button>'); + if (this.model.length == 0) { + status + .removeClass('label-success') + .addClass('label-danger') + .html('<span class="glyphicon glyphicon-fire"></span>'); + } + var self = this; moveButton.on('click', function() { self.move(); |