Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Added content_type to ticket_articles.

Browse source
This commit is contained in:
Martin Edenhofer 2014-12-27 14:10:09 +01:00
parent f8340b3b3b
commit cfc06fe1a8
3 changed files with 27 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee
View file

@ -329,25 +329,27 @@ class App.TicketCreate extends App.Controller
# create article # create article
if sender.name is 'Customer' if sender.name is 'Customer'
params['article'] = { params['article'] = {
to: (group && group.name) || '' to: (group && group.name) || ''
from: params.customer_id_autocompletion from: params.customer_id_autocompletion
cc: params.cc cc: params.cc
subject: params.subject subject: params.subject
body: params.body body: params.body
type_id: type.id type_id: type.id
sender_id: sender.id sender_id: sender.id
form_id: @form_id form_id: @form_id
content_type: 'text/html'
} }
else else
params['article'] = { params['article'] = {
from: (group && group.name) || '' from: (group && group.name) || ''
to: params.customer_id_autocompletion to: params.customer_id_autocompletion
cc: params.cc cc: params.cc
subject: params.subject subject: params.subject
body: params.body body: params.body
type_id: type.id type_id: type.id
sender_id: sender.id sender_id: sender.id
form_id: @form_id form_id: @form_id
content_type: 'text/html'
} }
ticket.load(params) ticket.load(params)

15
app/assets/javascripts/app/controllers/customer_ticket_create.js.coffee
View file

@ -178,13 +178,14 @@ class Index extends App.ControllerContent
# create article # create article
params['article'] = { params['article'] = {
from: "#{ @Session.get().displayName() }" from: "#{ @Session.get().displayName() }"
to: (group && group.name) || '' to: (group && group.name) || ''
subject: params.subject subject: params.subject
body: params.body body: params.body
type_id: type.id type_id: type.id
sender_id: sender.id sender_id: sender.id
form_id: @form_id form_id: @form_id
content_type: 'text/html'
} }
ticket.load(params) ticket.load(params)

2
app/assets/javascripts/app/views/ticket_zoom/edit.jst.eco
View file

@ -52,7 +52,7 @@
<div class="text-bubble"> <div class="text-bubble">
<div class="bubble-arrow"></div> <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) --> <!-- .text-bubble grows with textarea (and expanding clone) -->
<div class="attachments"></div> <div class="attachments"></div>
<div class="article-attachment u-unclickable u-textTruncate"> <div class="article-attachment u-unclickable u-textTruncate">