From e74c72f486058b4eb5e53fe50119cb51f0ebcdbd Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Sat, 9 May 2020 19:19:06 +0200
Subject: [PATCH] Don't open task detail in popup for list and table view

---
 src/components/lists/views/Table.vue               |  4 ++--
 src/components/tasks/reusable/singleTaskInList.vue |  2 +-
 src/router/index.js                                | 13 ++++++-------
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/components/lists/views/Table.vue b/src/components/lists/views/Table.vue
index fc8fbbc1..89616616 100644
--- a/src/components/lists/views/Table.vue
+++ b/src/components/lists/views/Table.vue
@@ -85,13 +85,13 @@
 			<tbody>
 			<tr v-for="t in tasks" :key="t.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 v-if="activeColumns.done">
 					<div class="is-done" v-if="t.done">Done</div>
 				</td>
 				<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 v-if="activeColumns.priority">
 					<priority-label :priority="t.priority" :show-all="true"/>
diff --git a/src/components/tasks/reusable/singleTaskInList.vue b/src/components/tasks/reusable/singleTaskInList.vue
index 405fec4c..52f2edf9 100644
--- a/src/components/tasks/reusable/singleTaskInList.vue
+++ b/src/components/tasks/reusable/singleTaskInList.vue
@@ -1,7 +1,7 @@
 <template>
 	<span>
 		<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 -->
 			<span class="parent-tasks" v-if="typeof task.relatedTasks.parenttask !== 'undefined'">
 				<template v-for="(pt, i) in task.relatedTasks.parenttask">
diff --git a/src/router/index.js b/src/router/index.js
index b103780e..539a32d9 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -15,6 +15,7 @@ import EditListComponent from '@/components/lists/EditList'
 import ShowTasksInRangeComponent from '@/components/tasks/ShowTasksInRange'
 import LinkShareAuthComponent from '../components/sharing/linkSharingAuth'
 import TaskDetailViewModal from '../components/tasks/TaskDetailViewModal'
+import TaskDetailView from '../components/tasks/TaskDetailView'
 // Namespace Handling
 import NewNamespaceComponent from '@/components/namespaces/NewNamespace'
 import EditNamespaceComponent from '@/components/namespaces/EditNamespace'
@@ -90,6 +91,11 @@ export default new Router({
 			name: 'editList',
 			component: EditListComponent
 		},
+		{
+			path: '/tasks/:id',
+			name: 'task.detail',
+			component: TaskDetailView,
+		},
 		{
 			path: '/lists/:listId',
 			name: 'list.index',
@@ -123,13 +129,6 @@ export default new Router({
 					path: '/lists/:listId/table',
 					name: 'list.table',
 					component: Table,
-					children: [
-						{
-							path: '/tasks/:id',
-							name: 'task.table.detail',
-							component: TaskDetailViewModal,
-						},
-					],
 				},
 				{
 					path: '/lists/:listId/kanban',