From b043369245305ea0f4d610dd7dae0049d3ad6631 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Thu, 30 Apr 2020 12:49:42 +0200
Subject: [PATCH] Fix navigating back to list view after deleting a task

---
 src/App.vue                                  |  2 +-
 src/components/lists/NewList.vue             |  2 +-
 src/components/sharing/linkSharingAuth.vue   |  2 +-
 src/components/tasks/TaskDetailView.vue      |  8 +++-----
 src/components/tasks/TaskDetailViewModal.vue | 12 +-----------
 src/router/index.js                          |  2 +-
 6 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index a88b178a..38d39cde 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -141,7 +141,7 @@
 								<div class="more-container" :key="n.id + 'child'">
 									<ul class="menu-list can-be-hidden" >
 										<li v-for="l in n.lists" :key="l.id">
-											<router-link :to="{ name: 'showList', params: { listId: l.id} }">
+											<router-link :to="{ name: 'list.index', params: { listId: l.id} }">
 												<span class="name">
 													<span class="color-bubble" v-if="l.hexColor !== ''" :style="{ backgroundColor: l.hexColor }"></span>
 													{{l.title}}
diff --git a/src/components/lists/NewList.vue b/src/components/lists/NewList.vue
index 2cdec2fd..e2e2d0ec 100644
--- a/src/components/lists/NewList.vue
+++ b/src/components/lists/NewList.vue
@@ -70,7 +70,7 @@
 					.then(response => {
 						this.$parent.loadNamespaces()
 						this.success({message: 'The list was successfully created.'}, this)
-						router.push({name: 'showList', params: {listId: response.id}})
+						router.push({name: 'list.index', params: {listId: response.id}})
 					})
 					.catch(e => {
 						this.error(e, this)
diff --git a/src/components/sharing/linkSharingAuth.vue b/src/components/sharing/linkSharingAuth.vue
index 099e6749..f7fca718 100644
--- a/src/components/sharing/linkSharingAuth.vue
+++ b/src/components/sharing/linkSharingAuth.vue
@@ -28,7 +28,7 @@
 				auth.linkShareAuth(this.$route.params.share)
 					.then((r) => {
 						this.loading = false
-						router.push({name: 'showList', params: {listId: r.listId}})
+						router.push({name: 'list.index', params: {listId: r.listId}})
 					})
 					.catch(e => {
 						this.error(e, this)
diff --git a/src/components/tasks/TaskDetailView.vue b/src/components/tasks/TaskDetailView.vue
index be633adc..086c8cf2 100644
--- a/src/components/tasks/TaskDetailView.vue
+++ b/src/components/tasks/TaskDetailView.vue
@@ -12,7 +12,7 @@
 			<!-- Commented out because it is a) not working and b) not working -->
 <!--			<h6 class="subtitle">-->
 <!--				{{ namespace.name }} >-->
-<!--				<router-link :to="{ name: 'showList', params: { id: list.id } }">-->
+<!--				<router-link :to="{ name: 'list.index', params: { id: list.id } }">-->
 <!--					{{ list.title }}-->
 <!--				</router-link>-->
 <!--			</h6>-->
@@ -306,7 +306,6 @@
 	import TaskService from '../../services/task'
 	import TaskModel from '../../models/task'
 	import relationKinds from '../../models/relationKinds'
-	import ListModel from '../../models/list'
 	import NamespaceModel from '../../models/namespace'
 
 	import priorites from '../../models/priorities'
@@ -323,7 +322,7 @@
 	import Reminders from './reusable/reminders'
 	import Comments from './reusable/comments'
 	import router from '../../router'
-	import ListSearch from "./reusable/listSearch";
+	import ListSearch from './reusable/listSearch'
 
 	export default {
 		name: 'TaskDetailView',
@@ -347,7 +346,6 @@
 				task: TaskModel,
 				relationKinds: relationKinds,
 
-				list: ListModel,
 				namespace: NamespaceModel,
 				showDeleteModal: false,
 				taskTitle: '',
@@ -484,7 +482,7 @@
 				this.taskService.delete(this.task)
 					.then(() => {
 						this.success({message: 'The task been deleted successfully.'}, this)
-						router.push({name: 'showList', params: {listId: this.list.id}})
+						router.back()
 					})
 					.catch(e => {
 						this.error(e, this)
diff --git a/src/components/tasks/TaskDetailViewModal.vue b/src/components/tasks/TaskDetailViewModal.vue
index 7cc0882e..bb714e54 100644
--- a/src/components/tasks/TaskDetailViewModal.vue
+++ b/src/components/tasks/TaskDetailViewModal.vue
@@ -5,7 +5,7 @@
 				<a @click="close()" class="close">
 					<icon icon="times"/>
 				</a>
-				<task-detail-view :parent-list="list" :parent-namespace="namespace"/>
+				<task-detail-view/>
 			</div>
 		</div>
 	</div>
@@ -17,12 +17,6 @@
 
 	export default {
 		name: 'TaskDetailViewModal',
-		data() {
-			return {
-				list: null,
-				namespace: null,
-			}
-		},
 		components: {
 			TaskDetailView,
 		},
@@ -33,7 +27,3 @@
 		},
 	}
 </script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/src/router/index.js b/src/router/index.js
index 4ba7337f..4c3c9bbf 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -92,7 +92,7 @@ export default new Router({
 		},
 		{
 			path: '/lists/:listId',
-			name: 'showList',
+			name: 'list.index',
 			component: ShowListComponent,
 			children: [
 				{