From abbeb572a8362d8fe7c9ff391092365be91f3f99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Tue, 18 May 2021 19:24:11 +0200 Subject: [PATCH] Update ticket fix auth on request --- app/Http/Requests/UpdateTicket.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/Http/Requests/UpdateTicket.php b/app/Http/Requests/UpdateTicket.php index 167da51..cdc15b9 100644 --- a/app/Http/Requests/UpdateTicket.php +++ b/app/Http/Requests/UpdateTicket.php @@ -11,11 +11,10 @@ class UpdateTicket extends StoreTicket if (auth()->user()->project_id) { $this->merge([ 'project_id' => auth()->user()->project_id, - 'status' => TicketStatus::new()->value, + 'status' => $this->project->status->value, ]); } - return auth()->check() or - auth()->user()->role === 1 or - request()->route()->ticket->created_by === auth()->user()->id; + return auth()->check() and (auth()->user()->role === 1 or + request()->route()->ticket->created_by === auth()->user()->id); } }