From faf8c804a9ec7ba28e5dc32fd261a2b70d1e0142 Mon Sep 17 00:00:00 2001 From: yogesh_gohil Date: Thu, 2 Dec 2021 10:31:16 +0530 Subject: [PATCH 1/3] fix: dashboard ability issue --- resources/scripts/views/dashboard/Dashboard.vue | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/resources/scripts/views/dashboard/Dashboard.vue b/resources/scripts/views/dashboard/Dashboard.vue index 032c61ce..4dc8b755 100644 --- a/resources/scripts/views/dashboard/Dashboard.vue +++ b/resources/scripts/views/dashboard/Dashboard.vue @@ -2,6 +2,21 @@ import DashboardStats from '../dashboard/DashboardStats.vue' import DashboardChart from '../dashboard/DashboardChart.vue' import DashboardTable from '../dashboard/DashboardTable.vue' +import { useUserStore } from '@/scripts/stores/user' +import { onMounted } from 'vue' +import { useRoute, useRouter } from 'vue-router' + +const route = useRoute() +const userStore = useUserStore() +const router = useRouter() + +onMounted(() => { + if (route.meta.ability && !userStore.hasAbilities(route.meta.ability)) { + router.push({ name: 'account.settings' }) + } else if (route.meta.isOwner && !userStore.currentUser.is_owner) { + router.push({ name: 'account.settings' }) + } +}) diff --git a/resources/scripts/views/items/Index.vue b/resources/scripts/views/items/Index.vue index a526e571..edc04130 100644 --- a/resources/scripts/views/items/Index.vue +++ b/resources/scripts/views/items/Index.vue @@ -50,12 +50,16 @@ @@ -298,6 +302,12 @@ function setFilters() { refreshTable() } +async function searchUnits(search) { + let res = await itemStore.fetchItemUnits({ search }) + + return res.data.data +} + async function fetchData({ page, filter, sort }) { let data = { search: filters.name,