From cfc06fe1a8a4bd9a22bd77ac2d57aecc06e17a6a Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Sat, 27 Dec 2014 14:10:09 +0100
Subject: [PATCH] Added content_type to ticket_articles.

---
 .../controllers/agent_ticket_create.js.coffee | 34 ++++++++++---------
 .../customer_ticket_create.js.coffee          | 15 ++++----
 .../app/views/ticket_zoom/edit.jst.eco        |  2 +-
 3 files changed, 27 insertions(+), 24 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 8c1fd5427..62262e123 100644
--- a/app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee
+++ b/app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee
@@ -329,25 +329,27 @@ class App.TicketCreate extends App.Controller
     # create article
     if sender.name is 'Customer'
       params['article'] = {
-        to:         (group && group.name) || ''
-        from:       params.customer_id_autocompletion
-        cc:         params.cc
-        subject:    params.subject
-        body:       params.body
-        type_id:    type.id
-        sender_id:  sender.id
-        form_id:    @form_id
+        to:           (group && group.name) || ''
+        from:         params.customer_id_autocompletion
+        cc:           params.cc
+        subject:      params.subject
+        body:         params.body
+        type_id:      type.id
+        sender_id:    sender.id
+        form_id:      @form_id
+        content_type: 'text/html'
       }
     else
       params['article'] = {
-        from:       (group && group.name) || ''
-        to:         params.customer_id_autocompletion
-        cc:         params.cc
-        subject:    params.subject
-        body:       params.body
-        type_id:    type.id
-        sender_id:  sender.id
-        form_id:    @form_id
+        from:         (group && group.name) || ''
+        to:           params.customer_id_autocompletion
+        cc:           params.cc
+        subject:      params.subject
+        body:         params.body
+        type_id:      type.id
+        sender_id:    sender.id
+        form_id:      @form_id
+        content_type: 'text/html'
       }
 
     ticket.load(params)
diff --git a/app/assets/javascripts/app/controllers/customer_ticket_create.js.coffee b/app/assets/javascripts/app/controllers/customer_ticket_create.js.coffee
index e658dcacc..62b295826 100644
--- a/app/assets/javascripts/app/controllers/customer_ticket_create.js.coffee
+++ b/app/assets/javascripts/app/controllers/customer_ticket_create.js.coffee
@@ -178,13 +178,14 @@ class Index extends App.ControllerContent
 
     # create article
     params['article'] = {
-      from:       "#{ @Session.get().displayName() }"
-      to:         (group && group.name) || ''
-      subject:    params.subject
-      body:       params.body
-      type_id:    type.id
-      sender_id:  sender.id
-      form_id:    @form_id
+      from:         "#{ @Session.get().displayName() }"
+      to:           (group && group.name) || ''
+      subject:      params.subject
+      body:         params.body
+      type_id:      type.id
+      sender_id:    sender.id
+      form_id:      @form_id
+      content_type: 'text/html'
     }
 
     ticket.load(params)
diff --git a/app/assets/javascripts/app/views/ticket_zoom/edit.jst.eco b/app/assets/javascripts/app/views/ticket_zoom/edit.jst.eco
index f706e1f98..5d2f7a260 100644
--- a/app/assets/javascripts/app/views/ticket_zoom/edit.jst.eco
+++ b/app/assets/javascripts/app/views/ticket_zoom/edit.jst.eco
@@ -52,7 +52,7 @@
 
         <div class="text-bubble">
           <div class="bubble-arrow"></div>
-          <div class="js-textarea ticketEdit-body" contenteditable="true" data-name="body"><%= @article.body %></div>
+          <div class="js-textarea ticketEdit-body" contenteditable="true" data-name="body"><%- @article.body %></div>
           <!-- .text-bubble grows with textarea (and expanding clone) -->
           <div class="attachments"></div>
           <div class="article-attachment u-unclickable u-textTruncate">