From c66c61404b0a0127f16ac2adc9542b54a99f7195 Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Tue, 6 Oct 2015 11:39:44 +0200 Subject: [PATCH] Fixed file uploading in new ticket. --- .../app/controllers/_ui_element/richtext.coffee | 7 ++++++- .../app/controllers/ticket_zoom/article_new.coffee | 4 ++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/app/controllers/_ui_element/richtext.coffee b/app/assets/javascripts/app/controllers/_ui_element/richtext.coffee index db688d2be..cad84f190 100644 --- a/app/assets/javascripts/app/controllers/_ui_element/richtext.coffee +++ b/app/assets/javascripts/app/controllers/_ui_element/richtext.coffee @@ -13,7 +13,7 @@ class App.UiElement.richtext renderAttachment = (file) => item.find('.attachments').append( App.view('generic/attachment_item')( fileName: file.filename - fileSize: @humanFileSize( file.size ) + fileSize: App.Utils.humanFileSize( file.size ) store_id: file.store_id )) item.on( @@ -82,7 +82,12 @@ class App.UiElement.richtext @attachmentPlaceholder.removeClass('hide') @attachmentUpload.addClass('hide') + # reset progress bar + @progressBar.width(parseInt(0) + '%') + @progressText.text('') + renderAttachment(response.data) + console.log('upload complete', response.data ) # Called during upload progress, first parameter diff --git a/app/assets/javascripts/app/controllers/ticket_zoom/article_new.coffee b/app/assets/javascripts/app/controllers/ticket_zoom/article_new.coffee index 612b05927..9ec00bdac 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom/article_new.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom/article_new.coffee @@ -196,6 +196,10 @@ class App.TicketZoomArticleNew extends App.Controller @attachmentPlaceholder.removeClass('hide') @attachmentUpload.addClass('hide') + # reset progress bar + @progressBar.width(parseInt(0) + '%') + @progressText.text('') + @renderAttachment(response.data) console.log('upload complete', response.data )