diff --git a/.gitignore b/.gitignore index 16d7679..3d663a0 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,8 @@ /vendor .env .env.backup +.env.dev +.env.prod .phpunit.result.cache Homestead.json Homestead.yaml diff --git a/app/Policies/TicketPolicy.php b/app/Policies/TicketPolicy.php index de00932..1f023b7 100644 --- a/app/Policies/TicketPolicy.php +++ b/app/Policies/TicketPolicy.php @@ -114,7 +114,17 @@ class TicketPolicy // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundBeforeLastUsed public function createMessage(User $user, Ticket $ticket) { - if ($user->role !== 1 and $ticket->created_by !== $user->id) { + //can create if + //role == 1 + // OR created_by == user->id + // OR project_id == user->projetct_id + + if ( + !($user->role === 1 + or $ticket->created_by === $user->id + or $ticket->project_id === $user->project_id) + ) + { return Response::deny(trans('Vous ne pouvez modifier un ticket qui ne vous appartient pas.')); } return $ticket->status->equals(TicketStatus::archived()) ? diff --git a/resources/views/ticket/show.blade.php b/resources/views/ticket/show.blade.php index a54a661..aa1a679 100644 --- a/resources/views/ticket/show.blade.php +++ b/resources/views/ticket/show.blade.php @@ -6,9 +6,9 @@