From a400ae32621682e8980c8a8e9b91c2c01097787d Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Sat, 17 Jan 2015 12:56:24 +0100 Subject: [PATCH] Improved split of tickets. --- .../app/controllers/agent_ticket_create.js.coffee | 7 ++++++- .../javascripts/app/controllers/ticket_zoom.js.coffee | 10 +++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee b/app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee index 5347ddd79..52cc296ff 100644 --- a/app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee +++ b/app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee @@ -173,7 +173,12 @@ class App.TicketCreate extends App.Controller t.owner_id = 0 t.customer_id_completion = a.from t.subject = a.subject || t.title - t.body = a.body + + # convert non text/html from text 2 html + if a.content_type.match(/\/html/) + t.body = a.body + else + t.body = App.Utils.text2html( a.body ) # render page @render( options: t ) diff --git a/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee b/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee index 631c095fd..2d61a9cbc 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee @@ -1653,11 +1653,11 @@ class Article extends App.Controller type: 'replyAll' href: '#' } - actions.push { - name: 'split' - type: 'split' - href: '#ticket/create/' + @article.ticket_id + '/' + @article.id - } + actions.push { + name: 'split' + type: 'split' + href: '#ticket/create/' + @article.ticket_id + '/' + @article.id + } @article.actions = actions attachments: ->