diff options
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget/components/approvals')
-rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals.vue | 4 | ||||
-rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_summary.vue | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals.vue b/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals.vue index 9b822657184..a5b83167283 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals.vue @@ -1,6 +1,7 @@ <script> import { GlButton } from '@gitlab/ui'; import { deprecatedCreateFlash as createFlash } from '~/flash'; +import { BV_SHOW_MODAL } from '~/lib/utils/constants'; import { s__ } from '~/locale'; import eventHub from '../../event_hub'; import approvalsMixin from '../../mixins/approvals'; @@ -124,7 +125,7 @@ export default { methods: { approve() { if (this.requirePasswordToApprove) { - this.$root.$emit('bv::show::modal', this.modalId); + this.$root.$emit(BV_SHOW_MODAL, this.modalId); return; } @@ -158,6 +159,7 @@ export default { .then((data) => { this.mr.setApprovals(data); eventHub.$emit('MRWidgetUpdateRequested'); + eventHub.$emit('ApprovalUpdated'); this.$emit('updated'); }) .catch(errFn) diff --git a/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_summary.vue b/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_summary.vue index fb342a5d340..ea73ab416de 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_summary.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_summary.vue @@ -1,8 +1,8 @@ <script> -import { n__, sprintf } from '~/locale'; import { toNounSeriesText } from '~/lib/utils/grammar'; -import UserAvatarList from '~/vue_shared/components/user_avatar/user_avatar_list.vue'; +import { n__, sprintf } from '~/locale'; import { APPROVED_MESSAGE } from '~/vue_merge_request_widget/components/approvals/messages'; +import UserAvatarList from '~/vue_shared/components/user_avatar/user_avatar_list.vue'; export default { components: { |