JandL_gitea/jandl-taskmanager-app
1
0 Fork 0
mirror of https://bitbucket.org/studiotem/jandl-taskmanager-app.git synced 2026-10-21 14:29:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Bugfix] Display subtask.title if is defined, instead of subtask.mastertask.title

Browse Source
This commit is contained in:
Matej Glasnák committed 2023-06-02 13:57:52 +02:00
1 parent 86f27b73bf
commit ac61d77122
3 files changed
+3 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/plugins/tm@dashboard/_components/z-timeline.vue
+1 -1
View File
@@ -69,7 +69,7 @@
<div class="event-content" :class="{'is-blocker': event.isBlocker}"> <div class="event-content" :class="{'is-blocker': event.isBlocker}">
<template v-if="event.type == 'subtask'"> <template v-if="event.type == 'subtask'">
<small v-if="event.subtask.project_code" class="project-code">{{ event.subtask.project_code }}</small> <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>
<template v-else> <template v-else>
app/src/plugins/tm@overview/tasks-ongoing/_components/a-ongoing-table.vue
+1 -1
View File
@@ -13,7 +13,7 @@
<tbody> <tbody>
<tr class="cursor-pointer" v-for="subtask in subtasks" :key="subtask.id" @click.stop="editTask(subtask, false)"> <tr class="cursor-pointer" v-for="subtask in subtasks" :key="subtask.id" @click.stop="editTask(subtask, false)">
<td>{{ subtask.project_code }}</td> <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 }} h</td>
<td>{{ subtask.duration - subtask.spent_time }} h</td> <td>{{ subtask.duration - subtask.spent_time }} h</td>
<td class="task-action"> <td class="task-action">
app/src/plugins/tm@overview/tasks-unscheduled/_components/a-unscheduled-table.vue
+1 -1
View File
@@ -13,7 +13,7 @@
<tr class="cursor-pointer" v-for="subtask in subtasks" :key="subtask.id" @click.stop="editTask(subtask, false)"> <tr class="cursor-pointer" v-for="subtask in subtasks" :key="subtask.id" @click.stop="editTask(subtask, false)">
<td>{{ subtask.project_code }}</td> <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>{{ subtask.spent_time }} h</td>
<td class="task-action"> <td class="task-action">
<div class="d-flex justify-start"> <div class="d-flex justify-start">