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

Improved merge dialog (increased width and prevent submit bubbling).

Browse source
This commit is contained in:
Martin Edenhofer 2016-12-15 08:38:57 +01:00
parent b19e54b3f4
commit 1962bb9b98
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/assets/javascripts/app/controllers/_application_controller.coffee
View file

@ -813,6 +813,7 @@ class App.ControllerModal extends App.Controller
@onCancel(e) @onCancel(e)
submit: (e) => submit: (e) =>
e.stopPropagation()
e.preventDefault() e.preventDefault()
@onSubmit(e) @onSubmit(e)

8
app/assets/javascripts/app/controllers/agent_ticket_merge.coffee
View file

@ -3,6 +3,7 @@ class App.TicketMerge extends App.ControllerModal
buttonCancel: true buttonCancel: true
buttonSubmit: true buttonSubmit: true
head: 'Merge' head: 'Merge'
large: true
shown: false shown: false
constructor: -> constructor: ->
@ -56,11 +57,16 @@ class App.TicketMerge extends App.ControllerModal
@formDisable(e) @formDisable(e)
params = @formParam(e.target) params = @formParam(e.target)
if !params.master_ticket_number
alert(App.i18n.translateInline('%s required!', 'Ticket#'))
@formEnable(e)
return
# merge tickets # merge tickets
@ajax( @ajax(
id: 'ticket_merge' id: 'ticket_merge'
type: 'GET' type: 'GET'
url: "#{@apiPath}/ticket_merge/#{@ticket.id}/#{params['master_ticket_number']}" url: "#{@apiPath}/ticket_merge/#{@ticket.id}/#{params.master_ticket_number}"
processData: true, processData: true,
success: (data, status, xhr) => success: (data, status, xhr) =>