diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-29 00:10:01 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-29 00:10:01 +0300 |
commit | 66e86bca7a31391e8ecf1ef84c7915ec70110c47 (patch) | |
tree | e07d28b1de6729832f38d1bcec908cebed6b7063 /app/assets/javascripts/admin | |
parent | 52e32e255f7d868c4ec952a201bb8813b5e03703 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/admin')
4 files changed, 28 insertions, 2 deletions
diff --git a/app/assets/javascripts/admin/users/components/actions/delete.vue b/app/assets/javascripts/admin/users/components/actions/delete.vue index 725d3dbf388..6f4f272154a 100644 --- a/app/assets/javascripts/admin/users/components/actions/delete.vue +++ b/app/assets/javascripts/admin/users/components/actions/delete.vue @@ -14,12 +14,22 @@ export default { type: Object, required: true, }, + oncallSchedules: { + type: Array, + required: false, + default: () => [], + }, }, }; </script> <template> - <shared-delete-action modal-type="delete" :username="username" :paths="paths"> + <shared-delete-action + modal-type="delete" + :username="username" + :paths="paths" + :oncall-schedules="oncallSchedules" + > <slot></slot> </shared-delete-action> </template> diff --git a/app/assets/javascripts/admin/users/components/actions/delete_with_contributions.vue b/app/assets/javascripts/admin/users/components/actions/delete_with_contributions.vue index 0ae15bfbebb..82b09c04ab2 100644 --- a/app/assets/javascripts/admin/users/components/actions/delete_with_contributions.vue +++ b/app/assets/javascripts/admin/users/components/actions/delete_with_contributions.vue @@ -14,12 +14,22 @@ export default { type: Object, required: true, }, + oncallSchedules: { + type: Array, + required: false, + default: () => [], + }, }, }; </script> <template> - <shared-delete-action modal-type="delete-with-contributions" :username="username" :paths="paths"> + <shared-delete-action + modal-type="delete-with-contributions" + :username="username" + :paths="paths" + :oncall-schedules="oncallSchedules" + > <slot></slot> </shared-delete-action> </template> diff --git a/app/assets/javascripts/admin/users/components/actions/shared/shared_delete_action.vue b/app/assets/javascripts/admin/users/components/actions/shared/shared_delete_action.vue index 9107d9ccdd9..b3b68442e80 100644 --- a/app/assets/javascripts/admin/users/components/actions/shared/shared_delete_action.vue +++ b/app/assets/javascripts/admin/users/components/actions/shared/shared_delete_action.vue @@ -18,6 +18,10 @@ export default { type: String, required: true, }, + oncallSchedules: { + type: Array, + required: true, + }, }, computed: { modalAttributes() { @@ -26,6 +30,7 @@ export default { 'data-delete-user-url': this.paths.delete, 'data-gl-modal-action': this.modalType, 'data-username': this.username, + 'data-oncall-schedules': JSON.stringify(this.oncallSchedules), }; }, }, diff --git a/app/assets/javascripts/admin/users/components/user_actions.vue b/app/assets/javascripts/admin/users/components/user_actions.vue index e92c97b54a3..f8fafb0d539 100644 --- a/app/assets/javascripts/admin/users/components/user_actions.vue +++ b/app/assets/javascripts/admin/users/components/user_actions.vue @@ -109,6 +109,7 @@ export default { :key="action" :paths="userPaths" :username="user.name" + :oncall-schedules="user.oncallSchedules" :data-testid="`delete-${action}`" > {{ $options.i18n[action] }} |