diff --git a/frontend/src/views/project/settings/ProjectSettingsDelete.vue b/frontend/src/views/project/settings/ProjectSettingsDelete.vue index d9862d2d7..69bd6c38f 100644 --- a/frontend/src/views/project/settings/ProjectSettingsDelete.vue +++ b/frontend/src/views/project/settings/ProjectSettingsDelete.vue @@ -52,7 +52,7 @@ const project = computed(() => projectStore.projects[route.params.projectId]) const childProjectIds = ref([]) watchEffect( - () => { + async () => { if (!route.params.projectId) { return } @@ -63,21 +63,20 @@ watchEffect( } const taskService = new TaskService() - taskService.getAll({}, {filter: `project in ${childProjectIds.value.join(',')}`}).then(() => { - totalTasks.value = taskService.totalPages * taskService.resultCount - }) + await taskService.getAll({}, {filter: `project in ${childProjectIds.value.join(',')}`}) + totalTasks.value = taskService.totalPages * taskService.resultCount }, ) useTitle(() => t('project.delete.title', {project: project?.value?.title})) const deleteNotice = computed(() => { - if(totalTasks.value && totalTasks.value > 0 && childProjectIds.value.length <= 1) { - return t('project.delete.tasksToDelete', {count: totalTasks.value}) - } - - if(totalTasks.value && totalTasks.value > 0 && childProjectIds.value.length > 1) { - return t('project.delete.tasksAndChildProjectsToDelete', {tasks: totalTasks.value, projects: childProjectIds.value.length}) + if(totalTasks.value && totalTasks.value > 0) { + if (childProjectIds.value.length <= 1) { + return t('project.delete.tasksToDelete', {count: totalTasks.value}) + } else if (childProjectIds.value.length > 1) { + return t('project.delete.tasksAndChildProjectsToDelete', {tasks: totalTasks.value, projects: childProjectIds.value.length}) + } } return t('project.delete.noTasksToDelete')