diff --git a/app/Http/Middleware/ShareInertiaData.php b/app/Http/Middleware/ShareInertiaData.php index 92a1dcca..cbe154f3 100644 --- a/app/Http/Middleware/ShareInertiaData.php +++ b/app/Http/Middleware/ShareInertiaData.php @@ -27,7 +27,6 @@ class ShareInertiaData /** @var PermissionStore $permissions */ $permissions = app(PermissionStore::class); Inertia::share(array_filter([ - 'permissions' => $request->user() !== null && $request->user()->currentTeam !== null ? $permissions->getPermissions($request->user()->currentTeam) : [], 'jetstream' => function () use ($request) { /** @var User|null $user */ $user = $request->user(); @@ -49,6 +48,7 @@ class ShareInertiaData ]; }, 'auth' => [ + 'permissions' => $request->user() !== null && $request->user()->currentTeam !== null ? $permissions->getPermissions($request->user()->currentTeam) : [], 'user' => function () use ($request): array { /** @var User|null $user */ $user = $request->user(); diff --git a/resources/js/Components/Common/Client/ClientMoreOptionsDropdown.vue b/resources/js/Components/Common/Client/ClientMoreOptionsDropdown.vue index 2ab8e438..a57b9f9b 100644 --- a/resources/js/Components/Common/Client/ClientMoreOptionsDropdown.vue +++ b/resources/js/Components/Common/Client/ClientMoreOptionsDropdown.vue @@ -2,6 +2,7 @@ import Dropdown from '@/Components/Dropdown.vue'; import { TrashIcon } from '@heroicons/vue/20/solid'; import type { Client } from '@/utils/api'; +import { canDeleteClients } from '@/utils/permissions'; const emit = defineEmits<{ delete: []; @@ -31,6 +32,7 @@ const props = defineProps<{