diff options
Diffstat (limited to 'app/assets/javascripts/diff_notes/services/resolve.js.es6')
-rw-r--r-- | app/assets/javascripts/diff_notes/services/resolve.js.es6 | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/app/assets/javascripts/diff_notes/services/resolve.js.es6 b/app/assets/javascripts/diff_notes/services/resolve.js.es6 index d929fba06b4..d15959c0909 100644 --- a/app/assets/javascripts/diff_notes/services/resolve.js.es6 +++ b/app/assets/javascripts/diff_notes/services/resolve.js.es6 @@ -45,12 +45,16 @@ mergeRequestId, discussionId }, {}).then((response) => { - const data = response.data; - const user = data ? data.resolved_by : null; - discussion.resolveAllNotes(user); - discussion.loading = false; + if (response.status === 200) { + const data = response.data; + const user = data ? data.resolved_by : null; + discussion.resolveAllNotes(user); + discussion.loading = false; - this.updateUpdatedHtml(discussionId, data); + this.updateUpdatedHtml(discussionId, data); + } else { + new Flash('An error occurred when trying to resolve a discussion. Please try again.', 'alert'); + } }); } @@ -66,11 +70,15 @@ mergeRequestId, discussionId }, {}).then((response) => { - const data = response.data; - discussion.unResolveAllNotes(); - discussion.loading = false; + if (response.status === 200) { + const data = response.data; + discussion.unResolveAllNotes(); + discussion.loading = false; - this.updateUpdatedHtml(discussionId, data); + this.updateUpdatedHtml(discussionId, data); + } else { + new Flash('An error occurred when trying to unresolve a discussion. Please try again.', 'alert'); + } }); } |