summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/diffs/components/diff_discussions.vue
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2018-09-03 17:43:35 +0200
committerTim Zallmann <tzallmann@gitlab.com>2018-09-07 12:25:50 +0200
commit173ecfc42b83eadbe5e28a3ac947f4f25f9d751d (patch)
tree8dc4185fb975a76e8a698712a3a13b2f3c7c221e /app/assets/javascripts/diffs/components/diff_discussions.vue
parent958cf02e91e7f715c2ce44a76dc264342fcadad0 (diff)
downloadgitlab-ce-173ecfc42b83eadbe5e28a3ac947f4f25f9d751d.tar.gz
Delete Discussions fix
Diffstat (limited to 'app/assets/javascripts/diffs/components/diff_discussions.vue')
-rw-r--r--app/assets/javascripts/diffs/components/diff_discussions.vue10
1 files changed, 10 insertions, 0 deletions
diff --git a/app/assets/javascripts/diffs/components/diff_discussions.vue b/app/assets/javascripts/diffs/components/diff_discussions.vue
index e64d5511d78..d7453834226 100644
--- a/app/assets/javascripts/diffs/components/diff_discussions.vue
+++ b/app/assets/javascripts/diffs/components/diff_discussions.vue
@@ -1,4 +1,5 @@
<script>
+import { mapActions } from 'vuex';
import noteableDiscussion from '../../notes/components/noteable_discussion.vue';
export default {
@@ -11,6 +12,14 @@ export default {
required: true,
},
},
+ methods: {
+ ...mapActions('diffs', ['removeDiscussionsFromDiff']),
+ deleteNoteHandler(discussion) {
+ if (discussion.notes.length <= 1) {
+ this.removeDiscussionsFromDiff(discussion);
+ }
+ },
+ },
};
</script>
@@ -31,6 +40,7 @@ export default {
:render-diff-file="false"
:always-expanded="true"
:discussions-by-diff-order="true"
+ @handleNoteDelete="deleteNoteHandler"
/>
</ul>
</div>