[MS] merge

Scille · Feb 13, 2025 · 9e53ae1 · 9e53ae1
1 parent 3056a3a
commit 9e53ae1
Showing 1 changed file with 1 addition and 4 deletions.
diff --git 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') }}
           </ion-button>
@@ -179,7 +179,6 @@ enum Steps {
   SelectUser,
   Processing,
   Summary,
-  End,
 }
 
 interface WorkspaceRoleUpdate {
@@ -193,7 +192,6 @@ const targetUser: Ref<UserInfo | undefined> = ref();
 const currentPage: Ref<Steps> = ref(Steps.SelectUser);
 const roleUpdates: Ref<WorkspaceRoleUpdate[]> = ref([]);
 const finished = ref(false);
-const showCloseButton = ref(true);
 
 const props = defineProps<{
   sourceUser: UserInfo;
@@ -319,7 +317,6 @@ async function nextStep(): Promise<void> {
     if (roleUpdates.value.length === 0 || finished.value) {
       await modalController.dismiss(null, MsModalResult.Confirm);
     } else {
-      showCloseButton.value = false;
       await assignNewRoles();
     }
   }