forge-joniko/ldc-supportweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ticket 376 fix ticket.show and ticket.index (preview message)

Browse source
This commit is contained in:
Jérémy Munsch 2021-09-30 09:09:04 +02:00
parent 3e2d3735cc
commit 1d83112b7c
No known key found for this signature in database
GPG key ID: 55196BEE445F6049
2 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
resources/views/ticket/index.blade.php
View file

@ -89,11 +89,7 @@ $userPr = Auth::user()->sites ?? collect([]);
</td>
<td>{{ $ticket->site->name }}</td>
<td>
@if ($ticket->type->equals(TicketType::bug()))
<span class="badge bg-danger">{{ $ticket->type->label }}</span>
@else
<span class="badge bg-success">{{ $ticket->type->label }}</span>
@endif
<span class="badge @if($ticket->type->equals(TicketType::bug())) bg-danger @else bg-success @endif">{{ $ticket->type->label }}</span>
</td>
<td>
@if ($ticket->file !== null)
@ -130,12 +126,12 @@ $userPr = Auth::user()->sites ?? collect([]);
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="ticket{{ $ticket->id }}ModalLabel">
{{ $ticket->site->name }} - {{__('Ticket N°') }}{{ $ticket->id }} - {{ $ticket->type === 0 ? "Bug" : "Évolution" }}
<b>{{ $ticket->site->name }}</b> - <u>{{__('Ticket n°') }} {{ $ticket->id }}</u> - <span class="badge @if($ticket->type->equals(TicketType::bug())) bg-danger @else bg-success @endif">{{ $ticket->type->label }}</span>
</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="{{ __('Fermer') }}"></button>
</div>
<div class="modal-body">
<p>{!! nl2br(e($ticket->text)) !!}</p>
<p>{!! clean(nl2br($ticket->text)) !!}</p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-sm btn-primary" data-bs-dismiss="modal">{{ __('Fermer') }}</button>

2
resources/views/ticket/show.blade.php
View file

@ -116,7 +116,7 @@
<hr>
<div>
<h4>{{__('Description') }}</h4>
<p>{!! Utils::plainToHtml($ticket->text) !!}</p>
<p>{!! clean(Utils::plainToHtml($ticket->text)) !!}</p>
<small class="text-muted">{!! __('Créé le :date par <b>:userName</b>', [
'date' => \Carbon\Carbon::parse($ticket->created_at)->format('d/m/Y à H:i'),
'userName' => $ticket->user ? $ticket->user->name : __('Utilisateur supprimé')