From eba20accc4f86b85b873567606dbaf996ff6c9f2 Mon Sep 17 00:00:00 2001 From: Vincent BRIDIER Date: Thu, 17 Apr 2025 16:24:27 +0200 Subject: [PATCH] fix: Some fixes --- app/Listeners/AddStatusMessages.php | 3 +-- resources/views/bo/modules/table-col-sorter-cell.blade.php | 4 ++-- .../views/bo/partials/inputs/bigint-foreign-id.blade.php | 2 +- resources/views/bo/partials/inputs/date.blade.php | 2 +- resources/views/bo/partials/inputs/int-color.blade.php | 2 +- resources/views/bo/partials/inputs/int-number.blade.php | 4 +--- .../views/bo/partials/inputs/pivot-belongsToMany.blade.php | 2 +- resources/views/bo/partials/inputs/publish-dates.blade.php | 2 +- .../bo/partials/inputs/search-belongs-to-dropdown.blade.php | 2 +- resources/views/bo/partials/inputs/text-html.blade.php | 2 +- resources/views/bo/partials/inputs/text-list-items.blade.php | 2 +- .../views/bo/partials/inputs/timestamp-datetime.blade.php | 2 +- resources/views/bo/partials/inputs/tinyint-boolean.blade.php | 2 +- resources/views/bo/partials/inputs/tinyint-enum.blade.php | 2 +- .../views/bo/partials/inputs/varchar-multiline.blade.php | 2 +- resources/views/bo/partials/inputs/varchar.blade.php | 2 +- resources/views/layout/nav.blade.php | 4 ++-- 17 files changed, 19 insertions(+), 22 deletions(-) diff --git a/app/Listeners/AddStatusMessages.php b/app/Listeners/AddStatusMessages.php index 84d453b..1edf542 100644 --- a/app/Listeners/AddStatusMessages.php +++ b/app/Listeners/AddStatusMessages.php @@ -22,8 +22,7 @@ class AddStatusMessages $message = new Message(); $message->ticket_id = $event->ticket->id; // * Le message system est privé si demandé (eg: Assignation à une personne). - $message->type = $event->is_private ? - MessageTypeEnum::public : MessageTypeEnum::private; + $message->type = $event->is_private ? MessageTypeEnum::private : MessageTypeEnum::public; if ($event->message) { $message->message = $event->message; } elseif ($event->user) { diff --git a/resources/views/bo/modules/table-col-sorter-cell.blade.php b/resources/views/bo/modules/table-col-sorter-cell.blade.php index 327bb32..d89d85d 100644 --- a/resources/views/bo/modules/table-col-sorter-cell.blade.php +++ b/resources/views/bo/modules/table-col-sorter-cell.blade.php @@ -44,11 +44,11 @@ session("$routeName.sort_col") !== $col or session("$routeName.sort_way") === 'asc' and session("$routeName.sort_col") === $col) @endif -@endif \ No newline at end of file +@endif diff --git a/resources/views/bo/partials/inputs/bigint-foreign-id.blade.php b/resources/views/bo/partials/inputs/bigint-foreign-id.blade.php index 00ae35a..dcf9d41 100644 --- a/resources/views/bo/partials/inputs/bigint-foreign-id.blade.php +++ b/resources/views/bo/partials/inputs/bigint-foreign-id.blade.php @@ -10,6 +10,6 @@ @include('modules.input-error', [ 'inputName' => $name, - 'helperId' => "{{ $id }}Help", + 'helperId' => $id."Help", 'helper' => $helper ]) diff --git a/resources/views/bo/partials/inputs/date.blade.php b/resources/views/bo/partials/inputs/date.blade.php index 652dede..d5a69c2 100644 --- a/resources/views/bo/partials/inputs/date.blade.php +++ b/resources/views/bo/partials/inputs/date.blade.php @@ -10,6 +10,6 @@ value="{{ old($name, ((isset($model) and $model->{$name}) ? ($model->{$name}->format('Y-m-d') ?? ($defaultValue ? Carbon\Carbon::today() : '')) : ($defaultValue ? Carbon\Carbon::today() : ''))) }}"> @include('modules.input-error', [ 'inputName' => $name, - 'helperId' => "{$id}Help", + 'helperId' => $id."Help", 'helper' => $helper ]) diff --git a/resources/views/bo/partials/inputs/int-color.blade.php b/resources/views/bo/partials/inputs/int-color.blade.php index b3b63f6..b42f1e9 100644 --- a/resources/views/bo/partials/inputs/int-color.blade.php +++ b/resources/views/bo/partials/inputs/int-color.blade.php @@ -24,7 +24,7 @@ @endif @include('modules.input-error', [ 'inputName' => $name, - 'helperId' => '{{ $id }}Help', + 'helperId' => $id."Help", 'helper' => $helper ]) diff --git a/resources/views/bo/partials/inputs/int-number.blade.php b/resources/views/bo/partials/inputs/int-number.blade.php index a42a331..7e1b841 100644 --- a/resources/views/bo/partials/inputs/int-number.blade.php +++ b/resources/views/bo/partials/inputs/int-number.blade.php @@ -3,9 +3,7 @@ {{ $label }} {{ $required ? '*' : '' }} @endif -@if(isset($appendText))
- @endif @include('modules.input-error', [ 'inputName' => $name, - 'helperId' => '{{ $id }}Help', + 'helperId' => $id.'Help', 'helper' => $helper ]) diff --git a/resources/views/bo/partials/inputs/pivot-belongsToMany.blade.php b/resources/views/bo/partials/inputs/pivot-belongsToMany.blade.php index 0bbccd4..10f1ea4 100644 --- a/resources/views/bo/partials/inputs/pivot-belongsToMany.blade.php +++ b/resources/views/bo/partials/inputs/pivot-belongsToMany.blade.php @@ -16,6 +16,6 @@ $data = [
@include('modules.input-error', [ 'inputName' => $name, - 'helperId' => "{$id}Help", + 'helperId' => $id."Help", 'helper' => $helper, ]) diff --git a/resources/views/bo/partials/inputs/publish-dates.blade.php b/resources/views/bo/partials/inputs/publish-dates.blade.php index 4df46a2..cedd68e 100644 --- a/resources/views/bo/partials/inputs/publish-dates.blade.php +++ b/resources/views/bo/partials/inputs/publish-dates.blade.php @@ -11,6 +11,6 @@ value="{{ old($name, ((isset($model) and $model->{$name}) ? $model->{$name}->format('Y-m-d\TH:i') : '')) }}"> @include('modules.input-error', [ 'inputName' => $name, - 'helperId' => $id . 'Help', + 'helperId' => $id."Help", 'helper' => (isset($model) and $model->{$name}) ? __('Leave empty for immediate display of the slider.') : __('Empty for immediate display of the slider.') ]) diff --git a/resources/views/bo/partials/inputs/search-belongs-to-dropdown.blade.php b/resources/views/bo/partials/inputs/search-belongs-to-dropdown.blade.php index 85d83d5..571de8e 100644 --- a/resources/views/bo/partials/inputs/search-belongs-to-dropdown.blade.php +++ b/resources/views/bo/partials/inputs/search-belongs-to-dropdown.blade.php @@ -23,6 +23,6 @@ $data = [
@include('modules.input-error', [ 'inputName' => $name, - 'helperId' => "{$id}Help", + 'helperId' => $id."Help", 'helper' => $helper, ]) diff --git a/resources/views/bo/partials/inputs/text-html.blade.php b/resources/views/bo/partials/inputs/text-html.blade.php index de91170..17b9af0 100644 --- a/resources/views/bo/partials/inputs/text-html.blade.php +++ b/resources/views/bo/partials/inputs/text-html.blade.php @@ -12,7 +12,7 @@ $data = [
@include('modules.input-error', [ 'inputName' => $name, - 'helperId' => "{$id}Help", + 'helperId' => $id."Help", 'helper' => $helper ?? __('crud.minicrud.text_warning', ['number' => 15]) . '. ' . __('validation.min.string', [ 'attribute' => $input['label'], 'min' => 15 diff --git a/resources/views/bo/partials/inputs/text-list-items.blade.php b/resources/views/bo/partials/inputs/text-list-items.blade.php index 6262b0b..5641ec9 100644 --- a/resources/views/bo/partials/inputs/text-list-items.blade.php +++ b/resources/views/bo/partials/inputs/text-list-items.blade.php @@ -23,7 +23,7 @@
@include('modules.input-error', [ 'inputName' => $name, - 'helperId' => "{$id}Help", + 'helperId' => $id."Help", 'helper' => $helper, ])
diff --git a/resources/views/bo/partials/inputs/timestamp-datetime.blade.php b/resources/views/bo/partials/inputs/timestamp-datetime.blade.php index bd1e4ca..ea9c701 100644 --- a/resources/views/bo/partials/inputs/timestamp-datetime.blade.php +++ b/resources/views/bo/partials/inputs/timestamp-datetime.blade.php @@ -10,6 +10,6 @@ value="{{ old($name, ((isset($model) and $model->{$name}) ? ($model->{$name}->format('Y-m-d\TH:i') ?? ($defaultValue ? Carbon\Carbon::today() : '')) : ($defaultValue ? Carbon\Carbon::today() : ''))) }}"> @include('modules.input-error', [ 'inputName' => $name, - 'helperId' => "{$id}Help", + 'helperId' => $id."Help", 'helper' => $helper ]) diff --git a/resources/views/bo/partials/inputs/tinyint-boolean.blade.php b/resources/views/bo/partials/inputs/tinyint-boolean.blade.php index a8fee20..5e4440d 100644 --- a/resources/views/bo/partials/inputs/tinyint-boolean.blade.php +++ b/resources/views/bo/partials/inputs/tinyint-boolean.blade.php @@ -10,5 +10,5 @@ @if(old($name, (old('_token') ? false : ($model->{$name} ?? false)))) checked @endif> @include('modules.input-error', [ - 'inputName' => $name, 'helperId' => '{{ $id }}Help' , 'helper' => $helper + 'inputName' => $name, 'helperId' => $id."Help", 'helper' => $helper ]) diff --git a/resources/views/bo/partials/inputs/tinyint-enum.blade.php b/resources/views/bo/partials/inputs/tinyint-enum.blade.php index 314fc7a..302f187 100644 --- a/resources/views/bo/partials/inputs/tinyint-enum.blade.php +++ b/resources/views/bo/partials/inputs/tinyint-enum.blade.php @@ -10,6 +10,6 @@ @include('modules.input-error', [ 'inputName' => $name, - 'helperId' => "{{ $id }}Help", + 'helperId' => $id."Help", 'helper' => $helper ]) diff --git a/resources/views/bo/partials/inputs/varchar-multiline.blade.php b/resources/views/bo/partials/inputs/varchar-multiline.blade.php index d1347db..6906f56 100644 --- a/resources/views/bo/partials/inputs/varchar-multiline.blade.php +++ b/resources/views/bo/partials/inputs/varchar-multiline.blade.php @@ -22,6 +22,6 @@ $data = [
@include('modules.input-error', [ 'inputName' => $name, - 'helperId' => "{$id}Help", + 'helperId' => $id."Help", 'helper' => $helper ]) diff --git a/resources/views/bo/partials/inputs/varchar.blade.php b/resources/views/bo/partials/inputs/varchar.blade.php index 1cfd04d..fa79d0a 100644 --- a/resources/views/bo/partials/inputs/varchar.blade.php +++ b/resources/views/bo/partials/inputs/varchar.blade.php @@ -21,6 +21,6 @@ @endif> @include('modules.input-error', [ 'inputName' => $name, - 'helperId' => $id.'Help', + 'helperId' => $id."Help", 'helper' => $helper ]) diff --git a/resources/views/layout/nav.blade.php b/resources/views/layout/nav.blade.php index fd454e4..696d66e 100644 --- a/resources/views/layout/nav.blade.php +++ b/resources/views/layout/nav.blade.php @@ -46,7 +46,7 @@ {{ trans_choice('models.classes.ticket_types', 2) }} @endcan @can('isAdmin') - {{ __('models.classes.labels') }} + {{ __('models.classes.labels') }} @endcan @@ -108,7 +108,7 @@ {{ __('Identifiants') }} -