fix: redirect to notes/tasks tab if created from activity tab
This commit is contained in:
parent
cd4b87a067
commit
5c3196fb3d
@ -5,6 +5,7 @@
|
|||||||
:task="task"
|
:task="task"
|
||||||
:doctype="doctype"
|
:doctype="doctype"
|
||||||
:doc="doc.data?.name"
|
:doc="doc.data?.name"
|
||||||
|
@after="redirect('tasks')"
|
||||||
/>
|
/>
|
||||||
<NoteModal
|
<NoteModal
|
||||||
v-model="showNoteModal"
|
v-model="showNoteModal"
|
||||||
@ -12,6 +13,7 @@
|
|||||||
:note="note"
|
:note="note"
|
||||||
:doctype="doctype"
|
:doctype="doctype"
|
||||||
:doc="doc.data?.name"
|
:doc="doc.data?.name"
|
||||||
|
@after="redirect('notes')"
|
||||||
/>
|
/>
|
||||||
</template>
|
</template>
|
||||||
<script setup>
|
<script setup>
|
||||||
@ -19,6 +21,7 @@ import TaskModal from '@/components/Modals/TaskModal.vue'
|
|||||||
import NoteModal from '@/components/Modals/NoteModal.vue'
|
import NoteModal from '@/components/Modals/NoteModal.vue'
|
||||||
import { call } from 'frappe-ui'
|
import { call } from 'frappe-ui'
|
||||||
import { ref } from 'vue'
|
import { ref } from 'vue'
|
||||||
|
import { useRoute, useRouter } from 'vue-router'
|
||||||
|
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
doctype: String,
|
doctype: String,
|
||||||
@ -74,6 +77,19 @@ function showNote(n) {
|
|||||||
showNoteModal.value = true
|
showNoteModal.value = true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// common
|
||||||
|
const route = useRoute()
|
||||||
|
const router = useRouter()
|
||||||
|
|
||||||
|
function redirect(tabName) {
|
||||||
|
if (route.name == 'Lead' || route.name == 'Deal') {
|
||||||
|
let hash = '#' + tabName
|
||||||
|
if (route.hash != hash) {
|
||||||
|
router.push({ ...route, hash })
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
defineExpose({
|
defineExpose({
|
||||||
showTask,
|
showTask,
|
||||||
deleteTask,
|
deleteTask,
|
||||||
|
|||||||
@ -141,7 +141,7 @@ const props = defineProps({
|
|||||||
const show = defineModel()
|
const show = defineModel()
|
||||||
const tasks = defineModel('reloadTasks')
|
const tasks = defineModel('reloadTasks')
|
||||||
|
|
||||||
const emit = defineEmits(['updateTask'])
|
const emit = defineEmits(['updateTask', 'after'])
|
||||||
|
|
||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
const { getUser } = usersStore()
|
const { getUser } = usersStore()
|
||||||
@ -202,6 +202,7 @@ async function updateTask() {
|
|||||||
if (d.name) {
|
if (d.name) {
|
||||||
capture('task_created')
|
capture('task_created')
|
||||||
tasks.value.reload()
|
tasks.value.reload()
|
||||||
|
emit('after')
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
show.value = false
|
show.value = false
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user