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

app/src/plugins/tm@dashboard/_components/z-timeline.vue

@@ -156,7 +156,9 @@ export default {
 			try {
 				const { subtask } = await this.$axios.put_auth(`v1/subtasks/${editedSubtask.id}`, editedSubtask)
 				this.$events.emit('on-subtask-edited', subtask)
-				this.$events.emit('show-task-add-time-modal', { subtask })
+
+				if (subtask.employee_id == this.$store.getters['auth/user'].id)
+					this.$events.emit('show-task-add-time-modal', { subtask })
 			} catch (error) {
 				this.$toast.error(error.message || error)
 			}

app/src/plugins/w/auth/auth.store.ts

@@ -1,5 +1,5 @@
 import axios from '@/plugins/w/axios/models/axios'
-// import './refreshExpired'
+import './refreshExpired'
 
 export default {
 	namespaced: true,

app/src/plugins/w/auth/refreshExpired.ts

@@ -3,7 +3,10 @@ import axios from 'axios'
 import store from '@/store'
 
 async function _unauthorised(error: any) {
-	return store.dispatch('auth/logout')
+	if (error?.response?.data?.message == 'Unauthenticated.')
+		return store.dispatch('auth/logout')
+	
+	return error
 }
 
 axios.interceptors.response.use(