diff options
author | Natalia Tepluhina <ntepluhina@gitlab.com> | 2019-05-01 15:58:52 +0300 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2019-05-01 15:58:52 +0300 |
commit | 5a5d52feefff0b5f93be00a0fff629a5da702834 (patch) | |
tree | 95140bd0355441a4d302316de73f1d8afbd74d69 /app/assets/javascripts | |
parent | e6665c2ebbb61f55c871c9681402118a063c9342 (diff) |
Resolve "Move EE differences for `app/assets/javascripts/notes/components/note_actions.vue`"
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r-- | app/assets/javascripts/batch_comments/mixins/resolved_status.js | 13 | ||||
-rw-r--r-- | app/assets/javascripts/notes/components/note_actions.vue | 11 |
2 files changed, 15 insertions, 9 deletions
diff --git a/app/assets/javascripts/batch_comments/mixins/resolved_status.js b/app/assets/javascripts/batch_comments/mixins/resolved_status.js new file mode 100644 index 00000000000..20c31d9f8a4 --- /dev/null +++ b/app/assets/javascripts/batch_comments/mixins/resolved_status.js @@ -0,0 +1,13 @@ +export default { + computed: { + resolveButtonTitle() { + let title = 'Mark as resolved'; + + if (this.resolvedBy) { + title = `Resolved by ${this.resolvedBy.name}`; + } + + return title; + }, + }, +}; diff --git a/app/assets/javascripts/notes/components/note_actions.vue b/app/assets/javascripts/notes/components/note_actions.vue index aabb77f6a85..7e8f23d6a96 100644 --- a/app/assets/javascripts/notes/components/note_actions.vue +++ b/app/assets/javascripts/notes/components/note_actions.vue @@ -2,6 +2,7 @@ import { mapGetters } from 'vuex'; import Icon from '~/vue_shared/components/icon.vue'; import { GlLoadingIcon, GlTooltipDirective } from '@gitlab/ui'; +import resolvedStatusMixin from 'ee_else_ce/batch_comments/mixins/resolved_status'; import ReplyButton from './note_actions/reply_button.vue'; export default { @@ -14,6 +15,7 @@ export default { directives: { GlTooltip: GlTooltipDirective, }, + mixins: [resolvedStatusMixin], props: { authorId: { type: Number, @@ -98,15 +100,6 @@ export default { currentUserId() { return this.getUserDataByProp('id'); }, - resolveButtonTitle() { - let title = 'Mark as resolved'; - - if (this.resolvedBy) { - title = `Resolved by ${this.resolvedBy.name}`; - } - - return title; - }, }, methods: { onEdit() { |