From 2bec1e1dc0b8047ca253521d7827d98893316520 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Fri, 18 Jun 2021 17:02:14 +0200 Subject: [PATCH] Fix ticket.index on user role admin --- app/Http/Controllers/TicketController.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/TicketController.php b/app/Http/Controllers/TicketController.php index 05b9080..216fea0 100644 --- a/app/Http/Controllers/TicketController.php +++ b/app/Http/Controllers/TicketController.php @@ -2,6 +2,7 @@ namespace App\Http\Controllers; +use App\Enums\Role; use App\Enums\TicketStatus; use App\Enums\TicketType; use App\Events\NotifySubscriptions; @@ -38,12 +39,14 @@ class TicketController extends Controller { /** @var \App\Models\User */ $user = auth()->user(); - $tickets = Ticket::with('project') - ->whereHas('project', function ($q) use ($user) { - $q->whereHas('users', function ($q) use ($user) { - $q->whereId($user->id); + $tickets = Ticket::with('project'); + if (!$user->role->equals(Role::admin())) { + $tickets = $tickets->whereHas('project', function ($q) use ($user) { + $q->whereHas('users', function ($q) use ($user) { + $q->whereId($user->id); + }); }); - }); + } $tickets = $tickets->where('status', $request->status ? '=' : '<>', TicketStatus::archived()); if ($request->search) { $tickets = $this->searchTicket($tickets, $request);