From 3e2d3735ccb2c6babd6645d0eba56287822ee889 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Thu, 30 Sep 2021 09:03:20 +0200 Subject: [PATCH 1/7] Fix ticket.show message user name --- resources/views/ticket/show.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/ticket/show.blade.php b/resources/views/ticket/show.blade.php index 3bd05fa..7649f2e 100644 --- a/resources/views/ticket/show.blade.php +++ b/resources/views/ticket/show.blade.php @@ -106,8 +106,8 @@
Ouvrir la pièce jointe
@endif

{!! __('Créé le :date par :userName', [ - 'date' => \Carbon\Carbon::parse($ticket->created_at)->format('d/m/Y à H:i'), - 'userName' => $ticket->user ? $ticket->user->name : __('Utilisateur supprimé') + 'date' => \Carbon\Carbon::parse($message->created_at)->format('d/m/Y à H:i'), + 'userName' => $message->user ? $message->user->name : __('Utilisateur supprimé') ]) !!} @endif From 1d83112b7cd07deb0e85aa13b30f911e02d6400c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Thu, 30 Sep 2021 09:09:04 +0200 Subject: [PATCH 2/7] 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([]); {{ $ticket->site->name }} - @if ($ticket->type->equals(TicketType::bug())) - {{ $ticket->type->label }} - @else - {{ $ticket->type->label }} - @endif + {{ $ticket->type->label }} @if ($ticket->file !== null) @@ -130,12 +126,12 @@ $userPr = Auth::user()->sites ?? collect([]);
- +
-

{!! nl2br(e($ticket->text)) !!}

+

{!! clean(nl2br($ticket->text)) !!}

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 @@

{{__('Description') }}

-

{!! Utils::plainToHtml($ticket->text) !!}

+

{!! clean(Utils::plainToHtml($ticket->text)) !!}

{!! __('Créé le :date par :userName', [ 'date' => \Carbon\Carbon::parse($ticket->created_at)->format('d/m/Y à H:i'), 'userName' => $ticket->user ? $ticket->user->name : __('Utilisateur supprimé') From b055f080c5513d1b8d6bbf7fc249a16f31f17eb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Thu, 30 Sep 2021 09:12:12 +0200 Subject: [PATCH 3/7] change label BG on ticket status span on ticket.show --- resources/views/ticket/show.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/ticket/show.blade.php b/resources/views/ticket/show.blade.php index 863e00b..ade9693 100644 --- a/resources/views/ticket/show.blade.php +++ b/resources/views/ticket/show.blade.php @@ -9,7 +9,7 @@ 'ticketSiteName' => $ticket->site->name, 'ticketTypeLabel' => $ticket->type->label ]) }} - {{ $ticket->status->label }} + {{ $ticket->status->label }}
@can('suscribeToTicket', $ticket) From a7faf707fcacfce3b34b9eb181e35e478851ffe5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Thu, 30 Sep 2021 09:13:31 +0200 Subject: [PATCH 4/7] previous url go back on ticket.show --- resources/views/ticket/show.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/ticket/show.blade.php b/resources/views/ticket/show.blade.php index ade9693..74f201c 100644 --- a/resources/views/ticket/show.blade.php +++ b/resources/views/ticket/show.blade.php @@ -3,7 +3,7 @@ @section('content')

- ← + ← {{ __('Ticket n° :ticketId : :ticketSiteName - :ticketTypeLabel', [ 'ticketId' => $ticket->id, 'ticketSiteName' => $ticket->site->name, From 8727d5882dcc029b74671f517e1d4f6214c597a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Thu, 30 Sep 2021 09:27:28 +0200 Subject: [PATCH 5/7] Smart back url on ticket.show --- resources/views/ticket/show.blade.php | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/resources/views/ticket/show.blade.php b/resources/views/ticket/show.blade.php index 74f201c..0acacb1 100644 --- a/resources/views/ticket/show.blade.php +++ b/resources/views/ticket/show.blade.php @@ -3,7 +3,23 @@ @section('content')

- ← + @php + $back = route('ticket.index'); + $url = parse_url(url()->previous()); + if ( + ($url['host'] ?? '') === parse_url(config('app.url'), PHP_URL_HOST) and + ($url['path'] ?? '') === '/ticket' + ) { + $queries = explode('&', $url['query'] ?? ''); + foreach($queries as $q) { + $q = explode('=', $q); + if(($q[0] ?? '') === 'pr' and ctype_digit(($q[1] ?? ''))) { + $back = route('ticket.index', ['pr' => $q[1]]); + } + } + } + @endphp + ← {{ __('Ticket n° :ticketId : :ticketSiteName - :ticketTypeLabel', [ 'ticketId' => $ticket->id, 'ticketSiteName' => $ticket->site->name, From 0b82f8629522b5e07250f7ef640a376ea57b1ee9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Thu, 30 Sep 2021 09:35:56 +0200 Subject: [PATCH 6/7] Ticket.index default orderBy tickets.DESC --- app/Http/Controllers/TicketController.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/Http/Controllers/TicketController.php b/app/Http/Controllers/TicketController.php index 148f320..d362273 100644 --- a/app/Http/Controllers/TicketController.php +++ b/app/Http/Controllers/TicketController.php @@ -93,6 +93,8 @@ class TicketController extends Controller Session::get('tickets.sort_col'), Session::get('tickets.sort_way') ); + } else { + $tickets = $tickets->orderBy('id', 'DESC'); } return $tickets; } From bf8486d11c3c328737e558940134efe92b3fe88f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Thu, 30 Sep 2021 09:36:39 +0200 Subject: [PATCH 7/7] update changelog bump to 1.0.4 --- CHANGELOG.md | 7 +++++++ composer.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cf74a24..06cd7ba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +### 30.09 -> 1.0.4 +- Correction lors de l'apperçu des messages +- Correction lors de message sur affichage (auteur message) +- Modification de la couleur BG sur label statut du ticket +- Modification de l'url précédent sur ticket.show (garde en mémoire le filtre multi projet) +- Modification Tri par défaut sur ticket id DESC + ### 29.09 -> 1.0.3 - Correction des avertissements avant cloture des tickets - Ajout d'un bouton pour les utilisateurs afin de réouvrir un ticket clos diff --git a/composer.json b/composer.json index 8a7d504..33f39a2 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "ldcweb/supportweb", - "version": "1.0.3", + "version": "1.0.4", "type": "project", "description": "The Laravel Framework.", "keywords": [