From 55ff49fd4259094469592da67b12dd8aab11c9ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Fri, 18 Jun 2021 16:29:16 +0200 Subject: [PATCH] Correction on ticket filter --- app/Http/Controllers/TicketController.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/TicketController.php b/app/Http/Controllers/TicketController.php index ce28b78..05b9080 100644 --- a/app/Http/Controllers/TicketController.php +++ b/app/Http/Controllers/TicketController.php @@ -36,10 +36,14 @@ class TicketController extends Controller public function index(SortTickets $request) { - $tickets = Ticket::query(); - if (auth()->user()->project_id) { - $tickets = $tickets->where('project_id', auth()->user()->project_id); - } + /** @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 = $tickets->where('status', $request->status ? '=' : '<>', TicketStatus::archived()); if ($request->search) { $tickets = $this->searchTicket($tickets, $request);