diff options
author | Fatih Acet <acetfatih@gmail.com> | 2017-08-18 18:40:07 +0300 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2017-08-18 18:52:17 +0300 |
commit | 4e77db396220ffea554ade7ea79f4f4120d1589b (patch) | |
tree | 77e56debcd3da42eff7c964a2dcbbfaba1a0b729 | |
parent | fc0035f66b8e5c0ccb6c31af8176bdd4101c2d99 (diff) | |
download | gitlab-ce-4e77db396220ffea554ade7ea79f4f4120d1589b.tar.gz |
IssueNotesRefactor: Fix discussion last updated text.
-rw-r--r-- | app/assets/javascripts/notes/components/issue_discussion.vue | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/app/assets/javascripts/notes/components/issue_discussion.vue b/app/assets/javascripts/notes/components/issue_discussion.vue index 2a10fd45ac2..96c63e587af 100644 --- a/app/assets/javascripts/notes/components/issue_discussion.vue +++ b/app/assets/javascripts/notes/components/issue_discussion.vue @@ -55,6 +55,24 @@ newNotePath() { return this.getIssueData.create_note_path; }, + lastUpdatedBy() { + const { notes } = this.note; + + if (notes.length > 1) { + return notes[notes.length - 1].author; + } + + return null; + }, + lastUpdatedAt() { + const { notes } = this.note; + + if (notes.length > 1) { + return notes[notes.length - 1].created_at; + } + + return null; + } }, methods: { ...mapActions([ @@ -152,9 +170,9 @@ class="discussion" /> <issue-note-edited-text - v-if="note.last_updated_by" - :edited-at="note.last_updated_at" - :edited-by="note.last_updated_by" + v-if="lastUpdatedBy" + :edited-at="lastUpdatedAt" + :edited-by="lastUpdatedBy" action-text="Last updated" class-name="discussion-headline-light js-discussion-headline" /> |