Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-07-29 17:50:58 +0300
committerPhil Hughes <me@iamphill.com>2016-07-29 17:50:58 +0300
commit03ea267f67ba749673037edf9d210eda4e918a99 (patch)
treeab983bef62b66b0ff5cbd98ed39d85c5c2a7c69c /app/assets/javascripts/diff_notes/services/resolve.js.es6
parentd147894b84d1978b967488cdc87716e0a524bfbc (diff)
Added tests for hidden jump to button
Diffstat (limited to 'app/assets/javascripts/diff_notes/services/resolve.js.es6')
-rw-r--r--app/assets/javascripts/diff_notes/services/resolve.js.es626
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');
+ }
});
}