Merge branch 'trunk'

This commit is contained in:
Jérémy Munsch 2021-11-15 14:39:30 +01:00
commit 7f47cd8585
No known key found for this signature in database
GPG key ID: 55196BEE445F6049

View file

@ -138,21 +138,21 @@
'userName' => $ticket->user ? $ticket->user->name : __('Utilisateur supprimé')
]) !!}</small>
</div>
@if ($ticket->file !== null || $ticket->file2 !== null)
@if (!is_null($ticket->file) or !is_null($ticket->file2))
<hr>
<div>
<h4>{{ __('Pièces jointes') }}</h4>
<ul>
@if ($ticket->file !== null)
@if (!is_null($ticket->file))
<li>
{{ __('Pièce jointe n°1') }} :
<a @if(Utils::isImageFile($ticket->file))data-fslightbox="gallery" @endif href="{{ asset($ticket->file) }}" target="_blank">{{ __('Ouvrir la pièce jointe') }}</a>
</li>
@endif
@if ($ticket->file2 !== null)
@if (!is_null($ticket->file2))
<li>
{{ __('Pièce jointe n°2') }} :
<a @if(Utils::isImageFile($ticket->file))data-fslightbox="gallery" @endif href="{{ asset($ticket->file2) }}" target="_blank">{{ __('Ouvrir la pièce jointe') }}</a>
<a @if(Utils::isImageFile($ticket->file2))data-fslightbox="gallery" @endif href="{{ asset($ticket->file2) }}" target="_blank">{{ __('Ouvrir la pièce jointe') }}</a>
</li>
@endif
</ul>