Merge branch 'trunk'

This commit is contained in:
Vincent BRIDIER 2022-04-01 14:57:26 +02:00
commit 488f3e7ea2
No known key found for this signature in database
GPG key ID: 8571BFA20420D512

View file

@ -131,12 +131,11 @@
]) !!}
</small>
@if($message->user_id === Auth::user()->id)
@can('updateMessage', $ticket, $message)
<button type="button" class="btn btn-sm btn-primary float-end" data-bs-toggle="modal" data-bs-target="#updateMessageModal">
<button type="button" class="btn btn-sm btn-primary float-end" data-bs-toggle="modal" data-bs-target="#updateMessageModal{{$message->id}}">
{{ __('Modifier le message') }}
</button>
<div class="modal fade" id="updateMessageModal" tabindex="-1" aria-labelledby="updateMessageModalLabel" aria-hidden="true">
<div class="modal fade" id="updateMessageModal{{$message->id}}" tabindex="-1" aria-labelledby="updateMessageModalLabel" aria-hidden="true">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<form action="{{ route('ticket.message.update', ['ticket'=>$ticket, 'message'=>$message]) }}" method="POST" enctype="multipart/form-data">
@ -165,7 +164,6 @@
</div>
</div>
@endcan
@endif
</div>
@endif