Added task auto close of merged ticket.
This commit is contained in:
parent
97a4219125
commit
0e60699d45
2 changed files with 7 additions and 3 deletions
|
@ -131,7 +131,9 @@ class App.TicketMerge extends App.ControllerModal
|
|||
@notify
|
||||
type: 'success',
|
||||
msg: App.i18n.translateContent( 'Ticket %s merged!', data.slave_ticket['number'] ),
|
||||
timeout: 6000,
|
||||
timeout: 4000,
|
||||
|
||||
App.TaskManager.remove( @task_key )
|
||||
|
||||
else
|
||||
|
||||
|
|
|
@ -83,9 +83,11 @@ class App.TicketZoom extends App.Controller
|
|||
App.Store.write( @key, data )
|
||||
|
||||
error: (xhr, status, error) =>
|
||||
|
||||
# do not close window if request is abort or network error exists
|
||||
return if status is 'abort'
|
||||
return if status is 'error'
|
||||
App.TaskManager.remove( @task_key )
|
||||
@release()
|
||||
)
|
||||
@doNotLog = 1
|
||||
|
||||
|
@ -599,7 +601,7 @@ class TicketActionRow extends App.Controller
|
|||
|
||||
merge_dialog: (e) ->
|
||||
e.preventDefault()
|
||||
new App.TicketMerge( ticket_id: @ticket.id )
|
||||
new App.TicketMerge( ticket_id: @ticket.id, task_key: @zoom.task_key )
|
||||
|
||||
customer_dialog: (e) ->
|
||||
e.preventDefault()
|
||||
|
|
Loading…
Reference in a new issue