Don't open task detail in popup for list and table view

This commit is contained in:
kolaente 2020-05-09 19:19:06 +02:00
parent 85a1f9f2a1
commit e74c72f486
No known key found for this signature in database
GPG key ID: F40E70337AB24C9B
3 changed files with 9 additions and 10 deletions

View file

@ -85,13 +85,13 @@
<tbody> <tbody>
<tr v-for="t in tasks" :key="t.id"> <tr v-for="t in tasks" :key="t.id">
<td v-if="activeColumns.id"> <td v-if="activeColumns.id">
<router-link :to="{name: 'task.table.detail', params: { id: t.id }}">{{ t.id }}</router-link> <router-link :to="{name: 'task.detail', params: { id: t.id }}">{{ t.id }}</router-link>
</td> </td>
<td v-if="activeColumns.done"> <td v-if="activeColumns.done">
<div class="is-done" v-if="t.done">Done</div> <div class="is-done" v-if="t.done">Done</div>
</td> </td>
<td v-if="activeColumns.text"> <td v-if="activeColumns.text">
<router-link :to="{name: 'task.table.detail', params: { id: t.id }}">{{ t.text }}</router-link> <router-link :to="{name: 'task.detail', params: { id: t.id }}">{{ t.text }}</router-link>
</td> </td>
<td v-if="activeColumns.priority"> <td v-if="activeColumns.priority">
<priority-label :priority="t.priority" :show-all="true"/> <priority-label :priority="t.priority" :show-all="true"/>

View file

@ -1,7 +1,7 @@
<template> <template>
<span> <span>
<fancycheckbox v-model="task.done" @change="markAsDone" :disabled="isArchived"/> <fancycheckbox v-model="task.done" @change="markAsDone" :disabled="isArchived"/>
<router-link :to="{ name: 'task.list.detail', params: { id: task.id } }" class="tasktext" :class="{ 'done': task.done}"> <router-link :to="{ name: 'task.detail', params: { id: task.id } }" class="tasktext" :class="{ 'done': task.done}">
<!-- Show any parent tasks to make it clear this task is a sub task of something --> <!-- Show any parent tasks to make it clear this task is a sub task of something -->
<span class="parent-tasks" v-if="typeof task.relatedTasks.parenttask !== 'undefined'"> <span class="parent-tasks" v-if="typeof task.relatedTasks.parenttask !== 'undefined'">
<template v-for="(pt, i) in task.relatedTasks.parenttask"> <template v-for="(pt, i) in task.relatedTasks.parenttask">

View file

@ -15,6 +15,7 @@ import EditListComponent from '@/components/lists/EditList'
import ShowTasksInRangeComponent from '@/components/tasks/ShowTasksInRange' import ShowTasksInRangeComponent from '@/components/tasks/ShowTasksInRange'
import LinkShareAuthComponent from '../components/sharing/linkSharingAuth' import LinkShareAuthComponent from '../components/sharing/linkSharingAuth'
import TaskDetailViewModal from '../components/tasks/TaskDetailViewModal' import TaskDetailViewModal from '../components/tasks/TaskDetailViewModal'
import TaskDetailView from '../components/tasks/TaskDetailView'
// Namespace Handling // Namespace Handling
import NewNamespaceComponent from '@/components/namespaces/NewNamespace' import NewNamespaceComponent from '@/components/namespaces/NewNamespace'
import EditNamespaceComponent from '@/components/namespaces/EditNamespace' import EditNamespaceComponent from '@/components/namespaces/EditNamespace'
@ -90,6 +91,11 @@ export default new Router({
name: 'editList', name: 'editList',
component: EditListComponent component: EditListComponent
}, },
{
path: '/tasks/:id',
name: 'task.detail',
component: TaskDetailView,
},
{ {
path: '/lists/:listId', path: '/lists/:listId',
name: 'list.index', name: 'list.index',
@ -123,13 +129,6 @@ export default new Router({
path: '/lists/:listId/table', path: '/lists/:listId/table',
name: 'list.table', name: 'list.table',
component: Table, component: Table,
children: [
{
path: '/tasks/:id',
name: 'task.table.detail',
component: TaskDetailViewModal,
},
],
}, },
{ {
path: '/lists/:listId/kanban', path: '/lists/:listId/kanban',