From ac61d77122f55af1c35d5355c7ef28c90416c70b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Glasn=C3=A1k?= <glasnak@wezeo.com>
Date: Fri, 2 Jun 2023 13:57:52 +0200
Subject: [PATCH] [Bugfix] Display subtask.title if is defined, instead of
 subtask.mastertask.title

---
 app/src/plugins/tm@dashboard/_components/z-timeline.vue         | 2 +-
 .../tm@overview/tasks-ongoing/_components/a-ongoing-table.vue   | 2 +-
 .../tasks-unscheduled/_components/a-unscheduled-table.vue       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/plugins/tm@dashboard/_components/z-timeline.vue b/app/src/plugins/tm@dashboard/_components/z-timeline.vue
index eddffe6..b6029e4 100644
--- a/app/src/plugins/tm@dashboard/_components/z-timeline.vue
+++ b/app/src/plugins/tm@dashboard/_components/z-timeline.vue
@@ -69,7 +69,7 @@
 					<div class="event-content" :class="{'is-blocker': event.isBlocker}"> 
 						<template v-if="event.type == 'subtask'">
 							<small v-if="event.subtask.project_code" class="project-code">{{ event.subtask.project_code }}</small>
-							<h3>{{ event.subtask.master_task?.name || event.subtask.master_task }}</h3>
+							<h3>{{ event.subtask.title ?? event.subtask.master_task?.name ?? event.subtask.master_task }}</h3>
 						</template>
 
 						<template v-else>
diff --git a/app/src/plugins/tm@overview/tasks-ongoing/_components/a-ongoing-table.vue b/app/src/plugins/tm@overview/tasks-ongoing/_components/a-ongoing-table.vue
index 0d3d49c..3c306d6 100644
--- a/app/src/plugins/tm@overview/tasks-ongoing/_components/a-ongoing-table.vue
+++ b/app/src/plugins/tm@overview/tasks-ongoing/_components/a-ongoing-table.vue
@@ -13,7 +13,7 @@
 		<tbody>
 			<tr class="cursor-pointer" v-for="subtask in subtasks" :key="subtask.id" @click.stop="editTask(subtask, false)">
 				<td>{{ subtask.project_code }}</td>
-				<td>{{ subtask.master_task?.name || subtask.master_task }}</td>
+				<td>{{ subtask.title ?? subtask.master_task?.name ?? subtask.master_task }}</td>
 				<td>{{ subtask.duration }} h</td>
 				<td>{{ subtask.duration - subtask.spent_time }} h</td>
 				<td class="task-action">
diff --git a/app/src/plugins/tm@overview/tasks-unscheduled/_components/a-unscheduled-table.vue b/app/src/plugins/tm@overview/tasks-unscheduled/_components/a-unscheduled-table.vue
index fdae460..8b2aad9 100644
--- a/app/src/plugins/tm@overview/tasks-unscheduled/_components/a-unscheduled-table.vue
+++ b/app/src/plugins/tm@overview/tasks-unscheduled/_components/a-unscheduled-table.vue
@@ -13,7 +13,7 @@
 			<tr class="cursor-pointer" v-for="subtask in subtasks" :key="subtask.id" @click.stop="editTask(subtask, false)">
 
 				<td>{{ subtask.project_code }}</td>
-				<td>{{ subtask.master_task?.name || subtask.master_task }}</td>
+				<td>{{ subtask.title ?? subtask.master_task?.name ?? subtask.master_task }}</td>
 				<td>{{ subtask.spent_time }} h</td>
 				<td class="task-action">
 					<div class="d-flex justify-start">