From 1f093bcda5cc848d5031f80ecc66f17da3a13aa9 Mon Sep 17 00:00:00 2001 From: Fatih Acet Date: Tue, 4 Jul 2017 02:04:58 +0300 Subject: [PATCH] =?UTF-8?q?IssueNotesRefactor:=20Don=E2=80=99t=20show=20re?= =?UTF-8?q?port=20as=20abuse=20link=20for=20own=20notes.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/assets/javascripts/notes/components/issue_note.vue | 4 ++++ .../javascripts/notes/components/issue_note_actions.vue | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/notes/components/issue_note.vue b/app/assets/javascripts/notes/components/issue_note.vue index 36561d06eac..8eadea95381 100644 --- a/app/assets/javascripts/notes/components/issue_note.vue +++ b/app/assets/javascripts/notes/components/issue_note.vue @@ -35,6 +35,9 @@ export default { 'disabled-content': this.isDeleting, }; }, + canReportAsAbuse() { + return this.note.report_abuse_path && this.author.id !== window.gon.current_user_id; + }, }, methods: { editHandler() { @@ -116,6 +119,7 @@ export default { :canAward="note.emoji_awardable" :canEdit="note.current_user.can_edit" :canDelete="note.current_user.can_edit" + :canReportAsAbuse="canReportAsAbuse" :reportAbusePath="note.report_abuse_path" :editHandler="editHandler" :deleteHandler="deleteHandler" /> diff --git a/app/assets/javascripts/notes/components/issue_note_actions.vue b/app/assets/javascripts/notes/components/issue_note_actions.vue index fb1c865d239..f95686497f5 100644 --- a/app/assets/javascripts/notes/components/issue_note_actions.vue +++ b/app/assets/javascripts/notes/components/issue_note_actions.vue @@ -22,6 +22,10 @@ export default { type: Boolean, required: true, }, + canReportAsAbuse: { + type: Boolean, + required: true, + }, editHandler: { type: Function, required: true, @@ -90,7 +94,7 @@ export default {
  • -
  • +
  • Report as abuse -- GitLab