Merge branch 'develop' into trunk

.gitignore

@@ -6,6 +6,8 @@
 /vendor
 .env
 .env.backup
+.env.dev
+.env.prod
 .phpunit.result.cache
 Homestead.json
 Homestead.yaml

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()) ?

resources/views/ticket/show.blade.php

@@ -6,9 +6,9 @@
         <h2 class="@can('suscribeToTicket', $ticket)col-md-8 @else col-md-10 @endcan">
             <a href="{{ route('home') }}" class="text-decoration-none">←</a>
             Ticket n°{{ $ticket->id }} : {{ $ticket->project->name }} - {{ $ticket->type->label }}
-            @cannot('createMessage', $ticket)
+            {{--@cannot('createMessage', $ticket)--}}
             <span class="badge badge-secondary">{{ $ticket->status->label }}</span>
-            @endcan
+            {{--@endcan--}}
         </h2>
         @can('suscribeToTicket', $ticket)
         <form action="{{ route('ticket.subscribe', $ticket->id) }}" method="POST" id="form_abonnement" class="col">