From eb31798f06375ff1d6345c8f082a90bd427e2850 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Sun, 10 Jan 2021 22:37:43 +0100
Subject: [PATCH] Fix getting back to the default task view when navigating
 back from a task modal

---
 src/views/tasks/TaskDetailView.vue      | 8 +++++++-
 src/views/tasks/TaskDetailViewModal.vue | 8 ++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/views/tasks/TaskDetailView.vue b/src/views/tasks/TaskDetailView.vue
index 70eb47b8..8b727924 100644
--- a/src/views/tasks/TaskDetailView.vue
+++ b/src/views/tasks/TaskDetailView.vue
@@ -1,7 +1,7 @@
 <template>
 	<div :class="{ 'is-loading': taskService.loading}" class="loader-container task-view-container">
 		<div class="task-view">
-			<heading v-model="task" :can-write="canWrite"/>
+			<heading v-model="task" :can-write="canWrite" ref="heading"/>
 			<h6 class="subtitle" v-if="parent && parent.namespace && parent.list">
 				{{ parent.namespace.title }} >
 				<router-link :to="{ name: listViewName, params: { listId: parent.list.id } }">
@@ -499,6 +499,12 @@ export default {
 				.catch(e => {
 					this.error(e, this)
 				})
+				.finally(() => {
+					this.scrollToHeading()
+				})
+		},
+		scrollToHeading() {
+			this.$refs.heading.$el.scrollIntoView({block: 'center'})
 		},
 		setActiveFields() {
 
diff --git a/src/views/tasks/TaskDetailViewModal.vue b/src/views/tasks/TaskDetailViewModal.vue
index e439b4b5..b0d99081 100644
--- a/src/views/tasks/TaskDetailViewModal.vue
+++ b/src/views/tasks/TaskDetailViewModal.vue
@@ -29,6 +29,14 @@ export default {
 			vm.lastRoute = from
 		})
 	},
+	beforeRouteLeave(to, from, next) {
+		if (from.name === 'task.kanban.detail' && to.name === 'task.detail') {
+			this.$router.replace({name: 'task.kanban.detail', params: to.params})
+			return
+		}
+
+		next()
+	},
 	methods: {
 		close() {
 			if (this.lastRoute === null) {