From ab29ac7a5cd5fa540a1452c51c6f76ab831fad33 Mon Sep 17 00:00:00 2001 From: kolaente Date: Sun, 29 Sep 2024 13:36:30 +0200 Subject: [PATCH] fix(task): do not show close button when the task was not opened via modal (cherry picked from commit 308e634c71eb11f6263cd13fdf7ec31971c22f58) --- frontend/src/components/tasks/partials/Heading.vue | 4 ++++ frontend/src/views/tasks/TaskDetailView.vue | 1 + 2 files changed, 5 insertions(+) diff --git a/frontend/src/components/tasks/partials/Heading.vue b/frontend/src/components/tasks/partials/Heading.vue index fac870ca2..9cb44bfba 100644 --- a/frontend/src/components/tasks/partials/Heading.vue +++ b/frontend/src/components/tasks/partials/Heading.vue @@ -16,6 +16,7 @@ :is-done="task.done" /> @@ -33,6 +34,7 @@ {{ task.title.trim() }} @@ -78,8 +80,10 @@ import {getHexColor, getTaskIdentifier} from '@/models/task' const props = withDefaults(defineProps<{ task: ITask, canWrite: boolean | undefined, + hasClose: boolean | undefined, }>(), { canWrite: false, + hasClose: false, }) const emit = defineEmits<{ diff --git a/frontend/src/views/tasks/TaskDetailView.vue b/frontend/src/views/tasks/TaskDetailView.vue index 9be07de63..b7d4de656 100644 --- a/frontend/src/views/tasks/TaskDetailView.vue +++ b/frontend/src/views/tasks/TaskDetailView.vue @@ -15,6 +15,7 @@ ref="heading" :task="task" :can-write="canWrite" + :has-close="isModal" @update:task="Object.assign(task, $event)" @close="$emit('close')" />