From 1d83112b7cd07deb0e85aa13b30f911e02d6400c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= <jeremy.munsch@ldc.fr>
Date: Thu, 30 Sep 2021 09:09:04 +0200
Subject: [PATCH] Ticket 376 fix ticket.show and ticket.index (preview message)

---
 resources/views/ticket/index.blade.php | 12 ++++--------
 resources/views/ticket/show.blade.php  |  2 +-
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/resources/views/ticket/index.blade.php b/resources/views/ticket/index.blade.php
index 49b1144..e71a3ac 100644
--- a/resources/views/ticket/index.blade.php
+++ b/resources/views/ticket/index.blade.php
@@ -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>
diff --git a/resources/views/ticket/show.blade.php b/resources/views/ticket/show.blade.php
index 7649f2e..863e00b 100644
--- a/resources/views/ticket/show.blade.php
+++ b/resources/views/ticket/show.blade.php
@@ -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é')