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

Merge branch…
ae52d1a4 · Phil Hughes · e953932d · ef443a99 · ae52d1a4
Commit ae52d1a4 authored Apr 15, 2017 by Phil Hughes
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

resolve_btn.js app/assets/javascripts/diff_notes/components/resolve_btn.js +4 -4

No files found.
--- a/app/assets/javascripts/diff_notes/components/resolve_btn.js
+++ b/app/assets/javascripts/diff_notes/components/resolve_btn.js
@@ -20,8 +20,7 @@ import Vue from 'vue';
    data: function () {
      return {
        discussions: CommentsStore.state,
-        loading: false,
-        note: {},
+        loading: false
      };
    },
    watch: {
@@ -34,6 +33,9 @@ import Vue from 'vue';
      discussion: function () {
        return this.discussions[this.discussionId];
      },
+      note: function () {
+        return this.discussion ? this.discussion.getNote(this.noteId) : {};
+      },
      buttonText: function () {
        if (this.isResolved) {
          return `Resolved by ${this.resolvedByName}`;
@@ -112,8 +114,6 @@ import Vue from 'vue';
        authorAvatar: this.authorAvatar,
        noteTruncated: this.noteTruncated,
      });
-
-      this.note = this.discussion.getNote(this.noteId);
    }
  });