From 34293909dd3f6c533217914034bcbe7373941adb Mon Sep 17 00:00:00 2001 From: Rolf Schmidt Date: Tue, 25 Apr 2017 16:19:07 +0200 Subject: [PATCH] Fixed issue #187 - Wrong article order after merging of tickets. --- .../ticket_zoom/article_view.coffee | 30 +++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/app/controllers/ticket_zoom/article_view.coffee b/app/assets/javascripts/app/controllers/ticket_zoom/article_view.coffee index 61f101602..3d7e15a54 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom/article_view.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom/article_view.coffee @@ -10,7 +10,7 @@ class App.TicketZoomArticleView extends App.Controller run: => all = [] - for ticket_article_id in @ticket_article_ids + for ticket_article_id, index in @ticket_article_ids controllerKey = ticket_article_id.toString() if !@articleController[controllerKey] el = $('
') @@ -21,7 +21,8 @@ class App.TicketZoomArticleView extends App.Controller ui: @ui highligher: @highligher ) - all.push el + if !@ticketArticleInsertByIndex(index, el) + all.push el @el.append(all) # check elements to remove @@ -34,6 +35,31 @@ class App.TicketZoomArticleView extends App.Controller controller.remove() delete @articleController[article_id.toString()] + ticketArticleInsertByIndex: (elIndex, el) => + return false if !@$('.ticket-article-item').length + + # in case of a merge it can happen that there are already + # articles rendered in the ticket, but the new article need + # to be inserted at the correct position in the the ticket + for index in [elIndex .. 0] + article_id = @ticket_article_ids[index] + continue if !article_id + article = @$(".ticket-article-item[data-id=#{article_id}]") + continue if !article.length + article.after(el) + return true + + for index in [elIndex .. @ticket_article_ids.length - 1] + article_id = @ticket_article_ids[index] + continue if !article_id + article = @$(".ticket-article-item[data-id=#{article_id}]") + continue if !article.length + article.before(el) + return true + + false + + class ArticleViewItem extends App.ObserverController model: 'TicketArticle' observe: