BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit ae52d1a4 by Phil Hughes
Options

Merge branch…

Merge branch '30492-using-icon-to-mark-discussion-as-resolved-does-not-resolve-discussion' into 'master' Resolve "Using icon to mark discussion as resolved does not resolve discussion" Closes #30492 See merge request !10652
parents e953932d ef443a99
Showing with 4 additions and 4 deletions
app/assets/javascripts/diff_notes/components/resolve_btn.js
...@@ -20,8 +20,7 @@ import Vue from 'vue'; ...@@ -20,8 +20,7 @@ import Vue from 'vue';
data: function () { data: function () {
return { return {
discussions: CommentsStore.state, discussions: CommentsStore.state,
loading: false, loading: false
note: {},
}; };
}, },
watch: { watch: {
...@@ -34,6 +33,9 @@ import Vue from 'vue'; ...@@ -34,6 +33,9 @@ import Vue from 'vue';
discussion: function () { discussion: function () {
return this.discussions[this.discussionId]; return this.discussions[this.discussionId];
}, },
note: function () {
return this.discussion ? this.discussion.getNote(this.noteId) : {};
},
buttonText: function () { buttonText: function () {
if (this.isResolved) { if (this.isResolved) {
return `Resolved by ${this.resolvedByName}`; return `Resolved by ${this.resolvedByName}`;
...@@ -112,8 +114,6 @@ import Vue from 'vue'; ...@@ -112,8 +114,6 @@ import Vue from 'vue';
authorAvatar: this.authorAvatar, authorAvatar: this.authorAvatar,
noteTruncated: this.noteTruncated, noteTruncated: this.noteTruncated,
}); });
this.note = this.discussion.getNote(this.noteId);
} }
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment