1 files changed, 21 insertions, 11 deletions
diff --git a/www/js/jingles.js b/www/js/jingles.js
index 04ae087..3475faf 100644
--- a/www/js/jingles.js
+++ b/www/js/jingles.js
@@ -116,11 +116,10 @@ Rdxport.JingleGroupView.prototype.destroy = function() {
   $('table > tbody', this.$el).empty();
 };
 
-Rdxport.JingleGroupView.prototype.uploadProgress = function(upload, file) {
+Rdxport.JingleGroupView.prototype.uploadProgress = function(upload) {
   var $cut = $('tr[data-upload-id="' + upload.uploadId + '"]').first();
   if (!$cut.hasClass('uploading')) {
     var $progressBar = $('.progressBarTemplate.jingles').clone().removeClass('progressBarTemplate');
-    $('.file-name', $progressBar).text(upload.filename);
     $cut.html($progressBar.html());
 
     $('button', $cut).on('click', function() {
@@ -129,14 +128,17 @@ Rdxport.JingleGroupView.prototype.uploadProgress = function(upload, file) {
 
     $cut.addClass('uploading');
   }
+  if (upload.title) {
+    $('.file-name', $cut).text(upload.title);
+  }
+  if (upload.cutNumber) {
+    $('.cut-number', $cut).text(upload.cutNumber);
+  }
 
   updateProgressBar($cut, upload);
 };
 
-Rdxport.JingleGroupView.prototype.uploadError = function(upload, file, status, errorString, acknowledge) {
-  if (!file.cartNumber || !file.cutNumber) {
-    return;
-  }
+Rdxport.JingleGroupView.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">' +
@@ -146,19 +148,27 @@ Rdxport.JingleGroupView.prototype.uploadError = function(upload, file, status, e
     .addClass('label-danger').html('<span class="glyphicon glyphicon-fire"></span>');
 
   var $errorRow = $('<tr>')
-    .attr('id', 'jingle-' + file.cartNumber + '-' + file.cutNumber)
+    .attr('data-upload-id', upload.uploadId)
     .append($('<td>').html(status))
-    .append($('<td>').text(file.cartNumber))
-    .append($('<td>').addClass('file-name').text(upload.filename))
+    .append($('<td>').addClass('cut-number').text('...'))
+    .append($('<td>').addClass('file-name'))
     .append($('<td>').append($('<b>').text('Import Fehler')))
     .append($('<td colspan="1">').append(reason))
     .append($('<td>').css('text-align', 'center').append(dismiss_button));
 
+  if (upload.cutNumber) {
+    $('.cut-number', $errorRow).text(upload.cutNumber);
+  }
+  if (upload.title) {
+    $('.file-name', $errorRow).text(upload.title);
+  }
+
   $('button', $errorRow).on('click', function() {
     acknowledge();
   });
 
-  $('#jingle-' + file.cartNumber + '-' + file.cutNumber).replaceWith($errorRow);
+  var $cart = $('tr[data-upload-id="' + upload.uploadId + '"]').first();
+  $cart.replaceWith($errorRow);
 };
 
 Rdxport.JingleCartView = function(model, groupView, active) {
@@ -244,7 +254,7 @@ Rdxport.JingleCutView.prototype.render = function() {
 
 Rdxport.JingleCutView.renderUploading = function(upload) {
   var $progressBar = $('.progressBarTemplate.jingles').clone().removeClass('progressBarTemplate');
-  $('.file-name', $progressBar).text(upload.filename);
+  $('.file-name', $progressBar).text(upload.title);
 
   var $el = $('<tr>')
     .html($progressBar.html())