Merge branch 'closing-mr-bug-fix' into 'master'
fixes bug with commenting on merge requests See merge request !2415
This commit is contained in:
commit
e47f0e563d
2 changed files with 11 additions and 6 deletions
|
@ -48,14 +48,15 @@ class @MergeRequest
|
|||
_this = @
|
||||
$('a.btn-close, a.btn-reopen').on 'click', (e) ->
|
||||
$this = $(this)
|
||||
if $this.data('submitted')
|
||||
return
|
||||
e.preventDefault()
|
||||
e.stopImmediatePropagation()
|
||||
shouldSubmit = $this.hasClass('btn-comment')
|
||||
console.log("shouldSubmit")
|
||||
if shouldSubmit && $this.data('submitted')
|
||||
return
|
||||
if shouldSubmit
|
||||
_this.submitNoteForm($this.closest('form'),$this)
|
||||
if $this.hasClass('btn-comment-and-close') || $this.hasClass('btn-comment-and-reopen')
|
||||
e.preventDefault()
|
||||
e.stopImmediatePropagation()
|
||||
_this.submitNoteForm($this.closest('form'),$this)
|
||||
|
||||
|
||||
submitNoteForm: (form, $button) =>
|
||||
noteText = form.find("textarea.js-note-text").val()
|
||||
|
|
|
@ -521,9 +521,13 @@ class @Notes
|
|||
if textarea.val().trim().length > 0
|
||||
form.find('.js-note-target-reopen').text('Comment & reopen')
|
||||
form.find('.js-note-target-close').text('Comment & close')
|
||||
form.find('.js-note-target-reopen').addClass('btn-comment-and-reopen')
|
||||
form.find('.js-note-target-close').addClass('btn-comment-and-close')
|
||||
else
|
||||
form.find('.js-note-target-reopen').text('Reopen')
|
||||
form.find('.js-note-target-close').text('Close')
|
||||
form.find('.js-note-target-reopen').removeClass('btn-comment-and-reopen')
|
||||
form.find('.js-note-target-close').removeClass('btn-comment-and-close')
|
||||
|
||||
initTaskList: ->
|
||||
@enableTaskList()
|
||||
|
|
Loading…
Reference in a new issue