diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2016-04-05 20:48:00 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2016-04-05 20:48:00 +0000 |
| commit | 2446f853bdd907bcff3f39f021a9803311a29658 (patch) | |
| tree | e3cfe737dc554d7e42540a9fcc9f7273b4fb130c | |
| parent | a1c794c5917e9dad414e54cdd4a6ae920c23dda2 (diff) | |
| parent | 1eeec7c63ee3a293f134ff16b5f2209e77ab0f6c (diff) | |
| download | gitlab-ce-2446f853bdd907bcff3f39f021a9803311a29658.tar.gz | |
Merge branch 'close-issue-bug' into 'master'
Fix data check in update issue response
See merge request !3548
| -rw-r--r-- | app/assets/javascripts/issue.js.coffee | 2 | ||||
| -rw-r--r-- | spec/javascripts/issue_spec.js.coffee | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/issue.js.coffee b/app/assets/javascripts/issue.js.coffee index 44a8aa68834..946d83b7bdd 100644 --- a/app/assets/javascripts/issue.js.coffee +++ b/app/assets/javascripts/issue.js.coffee @@ -34,7 +34,7 @@ class @Issue issueStatus = if isClose then 'close' else 'open' new Flash(issueFailMessage, 'alert') success: (data, textStatus, jqXHR) -> - if data.saved + if 'id' of data $(document).trigger('issuable:change'); if isClose $('a.btn-close').addClass('hidden') diff --git a/spec/javascripts/issue_spec.js.coffee b/spec/javascripts/issue_spec.js.coffee index 86ba9dd8e96..ea27f36e9b5 100644 --- a/spec/javascripts/issue_spec.js.coffee +++ b/spec/javascripts/issue_spec.js.coffee @@ -29,8 +29,8 @@ describe 'reopen/close issue', -> spyOn(jQuery, 'ajax').and.callFake (req) -> expect(req.type).toBe('PUT') expect(req.url).toBe('http://gitlab.com/issues/6/close') - req.success saved: true - + req.success id: 34 + $btnClose = $('a.btn-close') $btnReopen = $('a.btn-reopen') expect($btnReopen).toBeHidden() @@ -94,7 +94,7 @@ describe 'reopen/close issue', -> spyOn(jQuery, 'ajax').and.callFake (req) -> expect(req.type).toBe('PUT') expect(req.url).toBe('http://gitlab.com/issues/6/reopen') - req.success saved: true + req.success id: 34 $btnClose = $('a.btn-close') $btnReopen = $('a.btn-reopen') |