kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Updated method name to be more descriptive

This commit is contained in:
Phil Hughes 2016-08-01 10:15:15 +01:00
parent 9accca43c3
commit f65d8eb326
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/diff_notes/components/resolve_btn.js.es6
View File

@ -70,7 +70,7 @@
const resolved_by = data ? data.resolved_by : null;
CommentsStore.update(this.discussionId, this.noteId, !this.isResolved, resolved_by);
ResolveService.updateUpdatedHtml(this.discussionId, data);
ResolveService.updateDiscussionHeadline(this.discussionId, data);
} else {
new Flash('An error occurred when trying to resolve a comment. Please try again.', 'alert');
}

7
app/assets/javascripts/diff_notes/services/resolve.js.es6
View File

@ -47,7 +47,6 @@
}
discussion.loading = true;
console.log(discussion.loading);
return this.discussionResource.save({
mergeRequestId,
@ -59,7 +58,7 @@
discussion.resolveAllNotes(resolved_by);
discussion.loading = false;
this.updateUpdatedHtml(discussionId, data);
this.updateDiscussionHeadline(discussionId, data);
} else {
new Flash('An error occurred when trying to resolve a discussion. Please try again.', 'alert');
}
@ -83,14 +82,14 @@
discussion.unResolveAllNotes();
discussion.loading = false;
this.updateUpdatedHtml(discussionId, data);
this.updateDiscussionHeadline(discussionId, data);
} else {
new Flash('An error occurred when trying to unresolve a discussion. Please try again.', 'alert');
}
});
}
updateUpdatedHtml(discussionId, data) {
updateDiscussionHeadline(discussionId, data) {
const $discussionHeadline = $(`.discussion[data-discussion-id="${discussionId}"] .js-discussion-headline`);
if (data.discussion_headline_html) {