From 9e53ae1a74adbedcc36f0011057a99dd9f94adef Mon Sep 17 00:00:00 2001 From: fabienSvstr Date: Thu, 13 Feb 2025 11:37:19 +0100 Subject: [PATCH] [MS] merge --- client/src/views/users/BulkRoleAssignmentModal.vue | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/client/src/views/users/BulkRoleAssignmentModal.vue b/client/src/views/users/BulkRoleAssignmentModal.vue index ba006145d04..a1a8a44e39c 100644 --- a/client/src/views/users/BulkRoleAssignmentModal.vue +++ b/client/src/views/users/BulkRoleAssignmentModal.vue @@ -131,7 +131,7 @@ fill="clear" size="default" @click="cancel" - v-if="showCloseButton" + v-if="currentPage !== Steps.Summary" > {{ $msTranslate('MyProfilePage.cancelButton') }} @@ -179,7 +179,6 @@ enum Steps { SelectUser, Processing, Summary, - End, } interface WorkspaceRoleUpdate { @@ -193,7 +192,6 @@ const targetUser: Ref = ref(); const currentPage: Ref = ref(Steps.SelectUser); const roleUpdates: Ref = ref([]); const finished = ref(false); -const showCloseButton = ref(true); const props = defineProps<{ sourceUser: UserInfo; @@ -319,7 +317,6 @@ async function nextStep(): Promise { if (roleUpdates.value.length === 0 || finished.value) { await modalController.dismiss(null, MsModalResult.Confirm); } else { - showCloseButton.value = false; await assignNewRoles(); } }