diff options
Diffstat (limited to 'www/js/musicpools.js')
-rw-r--r-- | www/js/musicpools.js | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/www/js/musicpools.js b/www/js/musicpools.js index d96d537..2292aa1 100644 --- a/www/js/musicpools.js +++ b/www/js/musicpools.js @@ -187,12 +187,10 @@ Rdxport.MusicpoolView.prototype.render = function() { }); }; -Rdxport.MusicpoolView.prototype.uploadProgress = function(upload, file) { +Rdxport.MusicpoolView.prototype.uploadProgress = function(upload) { var $cart = $('tr[data-upload-id="' + upload.uploadId + '"]').first(); if (!$cart.hasClass('uploading')) { var $progressBar = $('.progressBarTemplate.musicpools').clone().removeClass('progressBarTemplate'); - $('.file-name', $progressBar).text(upload.filename); - $('.cart-number', $progressBar).text(file.cartNumber); $cart.html($progressBar.html()); $('button', $cart).on('click', function() { @@ -201,32 +199,43 @@ Rdxport.MusicpoolView.prototype.uploadProgress = function(upload, file) { $cart.addClass('uploading'); } + if (upload.title) { + $('.file-name', $cart).text(upload.title); + } + if (upload.cartNumber) { + $('.cart-number', $cart).text(upload.cartNumber); + } updateProgressBar($cart, upload); }; -Rdxport.MusicpoolView.prototype.uploadError = function(upload, file, status, errorString, acknowledge) { - if (!file.cartNumber) { - return; - } +Rdxport.MusicpoolView.prototype.uploadError = function(upload, status, errorString, acknowledge) { var reason = $('<span>').addClass('label').addClass('label-danger').text(status).after($('<b>').text(' ' + errorString)); var dismiss_button = '<button class="btn btn-info btn-xs">' + '<span class="glyphicon glyphicon-remove"></span> Ok</button>'; var $errorRow = $('<tr>') - .attr('id', 'musicpool-' + file.cartNumber) - .append($('<td>').text(file.cartNumber)) - .append($('<td>').addClass('file-name').text(upload.filename)) + .attr('data-upload-id', upload.uploadId) + .append($('<td>').addClass('.cart-number').text('...')) + .append($('<td>').addClass('file-name')) .append($('<td>').append($('<b>').text('Import Fehler'))) .append($('<td colspan="5">').append(reason)) .append($('<td>').css('text-align', 'center').append(dismiss_button)); + if (upload.cartNumber) { + $('.cart-number', $errorRow).text(upload.cartNumber); + } + if (upload.title) { + $('.file-name', $errorRow).text(upload.title); + } + $('button', $errorRow).on('click', function() { acknowledge(); }); - $('#musicpool-' + file.cartNumber).replaceWith($errorRow); + var $cart = $('tr[data-upload-id="' + upload.uploadId + '"]').first(); + $cart.replaceWith($errorRow); }; Rdxport.MusicpoolCartView = function(model) { @@ -281,7 +290,7 @@ Rdxport.MusicpoolCartView.prototype.render = function() { Rdxport.MusicpoolCartView.renderUploading = function(upload) { var $progressBar = $('.progressBarTemplate.musicpools').clone().removeClass('progressBarTemplate'); - $('.file-name', $progressBar).text(upload.filename); + $('.file-name', $progressBar).text(upload.title); var $el = $('<tr>') .html($progressBar.html()) |