Merge branch 'main' of bitbucket.org:studiotem/jandl-taskmanager-app

app/src/plugins/app/_config/App.vue

@@ -78,7 +78,9 @@ export default {
 			this.$refs['z-task-modal'].showModal(task, editMode, masterTask)
 		})
 
-		this.$events.on('show-master-task-modal', ({masterTask, editMode}) => {
+		this.$events.on('show-master-task-modal', ({ masterTask, editMode }) => {
+			const id = masterTask.id
+			this.$router.push({ query: { 'master-task': id } })
 			this.$refs['z-master-task-modal'].showModal(masterTask, editMode)
 		})
 
@@ -119,6 +121,14 @@ export default {
 		onMasterTaskEdited(masterTask){
 			this.$events.emit('on-master-task-edited', masterTask)
 		}
+	},
+
+	watch: {
+		'$route'() {
+			if (this.$route.query['master-task']) {
+				this.$events.emit('show-master-task-modal', { masterTask: { id: this.$route.query['master-task'] }, editMode: false })
+			}
+		}
 	}
 }
 </script>

app/src/plugins/app/_config/router.ts

@@ -107,18 +107,4 @@ const router = createRouter({
 	routes
 })
 
-// router.afterEach((to) => {
-// 	if (to.fullPath.includes('?master-task')) {
-// 		const searchParams = new URLSearchParams(to.fullPath.split('?')[1])
-// 		const id = searchParams.get('id')
-		
-// 		this.$events.emit('show-master-task-modal', { id })
-// 	} else if (to.fullPath.includes('?task')) {
-// 		const searchParams = new URLSearchParams(to.fullPath.split('?')[1])
-// 		const id = searchParams.get('id')
-		
-// 		this.$events.emit('show-task-modal', { id })
-// 	}
-// })
-
 export default router