diff --git a/app/Http/Requests/CreateMessage.php b/app/Http/Requests/CreateMessage.php index 99c198f..f754e0e 100644 --- a/app/Http/Requests/CreateMessage.php +++ b/app/Http/Requests/CreateMessage.php @@ -19,6 +19,12 @@ class CreateMessage extends FormRequest if (!($user = auth()->user())) { return false; } + if ( + !auth()->user()->can('createPrivateMessage', request()->route()->ticket) + && $this->is_private == MessageType::private() + ) { + return false; + } return auth()->check() and auth()->user()->sites and ( $user->isAdmin() or auth()->user()->sites->contains(request()->route()->ticket->site_id) @@ -36,7 +42,7 @@ class CreateMessage extends FormRequest { $this->merge([ 'subscribe' => $this->subscribe ? true : false, - 'type' => $this->type == MessageType::private() ? MessageType::private()->value : MessageType::public()->value + 'type' => $this->is_private ? MessageType::private()->value : MessageType::public()->value ]); } diff --git a/app/Policies/TicketPolicy.php b/app/Policies/TicketPolicy.php index 68c6e69..8264119 100644 --- a/app/Policies/TicketPolicy.php +++ b/app/Policies/TicketPolicy.php @@ -46,7 +46,7 @@ class TicketPolicy extends RootPolicy ]), 'suscribeToTicket' => TicketStaticRules::make('ticketIsNotArchived', $model), 'createMessage' => TicketStaticRules::make('ticketIsNotArchived', $model), - 'createPrivateMessage' => StaticRules::or([ + 'createPrivateMessage' => StaticRules::and([ URR::make('userIsAdmin', $user), TicketStaticRules::make('ticketIsNotArchived', $model), ]), diff --git a/resources/views/ticket/show.blade.php b/resources/views/ticket/show.blade.php index 8cbf63b..f6ae88a 100644 --- a/resources/views/ticket/show.blade.php +++ b/resources/views/ticket/show.blade.php @@ -126,11 +126,11 @@ - @if(Auth::check() and !Auth::user()->role->equals(Role::client())) + @can('createPrivateMessage', $ticket)