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

Improved split of tickets.

Browse source
This commit is contained in:
Martin Edenhofer 2015-01-17 12:56:24 +01:00
parent a25e977edc
commit a400ae3262
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -173,7 +173,12 @@ class App.TicketCreate extends App.Controller
t.owner_id = 0 t.owner_id = 0
t.customer_id_completion = a.from t.customer_id_completion = a.from
t.subject = a.subject || t.title 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 page
@render( options: t ) @render( options: t )

10
app/assets/javascripts/app/controllers/ticket_zoom.js.coffee
View file

@ -1653,11 +1653,11 @@ class Article extends App.Controller
type: 'replyAll' type: 'replyAll'
href: '#' href: '#'
} }
actions.push { actions.push {
name: 'split' name: 'split'
type: 'split' type: 'split'
href: '#ticket/create/' + @article.ticket_id + '/' + @article.id href: '#ticket/create/' + @article.ticket_id + '/' + @article.id
} }
@article.actions = actions @article.actions = actions
attachments: -> attachments: ->