vikunja/frontend
Archived
6
39
Fork 48
Code Issues 1 Pull Requests 4 Projects Releases 26 Activity

fix(project): correctly show project color next to project title in list view
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source 
Resolves https://community.vikunja.io/t/color-bubbles-not-showing-after-import/1648
This commit is contained in:
kolaente 2023-09-29 20:46:02 +02:00
parent 287daf9125
commit 66c7a05cdb
Signed by: konrad
GPG Key ID: F40E70337AB24C9B
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/components/tasks/partials/singleTaskInProject.vue
View File

@ -12,7 +12,7 @@
/> />
<ColorBubble <ColorBubble
v-if="showProjectColor && projectColor !== '' && currentProject?.id !== task.projectId" v-if="!showProjectSeparately && projectColor !== '' && currentProject?.id !== task.projectId"
:color="projectColor" :color="projectColor"
class="mr-1" class="mr-1"
/> />
@ -107,8 +107,14 @@
{{ task.percentDone * 100 }}% {{ task.percentDone * 100 }}%
</progress> </progress>
<ColorBubble
v-if="showProjectSeparately && projectColor !== '' && currentProject?.id !== task.projectId"
:color="projectColor"
class="mr-1"
/>
<router-link <router-link
v-if="!showProject && currentProject?.id !== task.projectId && project" v-if="showProjectSeparately"
:to="{ name: 'project.list', params: { projectId: task.projectId } }" :to="{ name: 'project.list', params: { projectId: task.projectId } }"
class="task-project" class="task-project"
v-tooltip="$t('task.detail.belongsToProject', {project: project.title})" v-tooltip="$t('task.detail.belongsToProject', {project: project.title})"
@ -132,7 +138,6 @@
<single-task-in-project <single-task-in-project
:key="subtask.id" :key="subtask.id"
:the-task="getTaskById(subtask.id)" :the-task="getTaskById(subtask.id)"
:show-project-color="showProjectColor"
:disabled="disabled" :disabled="disabled"
:can-mark-as-done="canMarkAsDone" :can-mark-as-done="canMarkAsDone"
:all-tasks="allTasks" :all-tasks="allTasks"
@ -180,7 +185,6 @@ const {
isArchived = false, isArchived = false,
showProject = false, showProject = false,
disabled = false, disabled = false,
showProjectColor = false,
canMarkAsDone = true, canMarkAsDone = true,
allTasks = [], allTasks = [],
} = defineProps<{ } = defineProps<{
@ -188,7 +192,6 @@ const {
isArchived?: boolean, isArchived?: boolean,
showProject?: boolean, showProject?: boolean,
disabled?: boolean, disabled?: boolean,
showProjectColor?: boolean,
canMarkAsDone?: boolean, canMarkAsDone?: boolean,
allTasks?: ITask[], allTasks?: ITask[],
}>() }>()
@ -232,6 +235,8 @@ const taskStore = useTaskStore()
const project = computed(() => projectStore.projects[task.value.projectId]) const project = computed(() => projectStore.projects[task.value.projectId])
const projectColor = computed(() => project.value ? project.value?.hexColor : '') const projectColor = computed(() => project.value ? project.value?.hexColor : '')
const showProjectSeparately = computed(() => !showProject && currentProject.value?.id !== task.value.projectId && project.value)
const currentProject = computed(() => { const currentProject = computed(() => {
return typeof baseStore.currentProject === 'undefined' ? { return typeof baseStore.currentProject === 'undefined' ? {
id: 0, id: 0,