fix: Some fixes
This commit is contained in:
parent
0bca962de9
commit
eba20accc4
17 changed files with 19 additions and 22 deletions
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -44,11 +44,11 @@
|
|||
session("$routeName.sort_col") !== $col or
|
||||
session("$routeName.sort_way") === 'asc' and session("$routeName.sort_col") === $col)
|
||||
<a class="btn btn-sm btn-outline-secondary text-decoration-none ms-1"
|
||||
href="{{ request()->fullUrlWithQuery(array_merge($iArgs, ['sort_way' => 'desc', 'rst' => null])) }}"data-bs-toggle="tooltip"
|
||||
href="{{ request()->fullUrlWithQuery(array_merge($iArgs, ['sort_way' => 'desc', 'rst' => null])) }}" data-bs-toggle="tooltip"
|
||||
title="{{ __('crud.other.sort_ascending', ['name' => str($colname)->lower()]) }}">
|
||||
<i class="fas fa-arrow-up 2xs"></i>
|
||||
</a>
|
||||
@endif
|
||||
</div>
|
||||
</th>
|
||||
@endif
|
||||
@endif
|
||||
|
|
|
|||
|
|
@ -10,6 +10,6 @@
|
|||
</select>
|
||||
@include('modules.input-error', [
|
||||
'inputName' => $name,
|
||||
'helperId' => "{{ $id }}Help",
|
||||
'helperId' => $id."Help",
|
||||
'helper' => $helper
|
||||
])
|
||||
|
|
|
|||
|
|
@ -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
|
||||
])
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
@endif
|
||||
@include('modules.input-error', [
|
||||
'inputName' => $name,
|
||||
'helperId' => '{{ $id }}Help',
|
||||
'helperId' => $id."Help",
|
||||
'helper' => $helper
|
||||
])
|
||||
|
||||
|
|
|
|||
|
|
@ -3,9 +3,7 @@
|
|||
<b>{{ $label }} {{ $required ? '*' : '' }}</b>
|
||||
</label>
|
||||
@endif
|
||||
@if(isset($appendText))
|
||||
<div class="input-group">
|
||||
@endif
|
||||
<input id="{{ $id }}"
|
||||
name="{{ $name }}"
|
||||
type="number"
|
||||
|
|
@ -39,6 +37,6 @@
|
|||
</div>
|
||||
@include('modules.input-error', [
|
||||
'inputName' => $name,
|
||||
'helperId' => '{{ $id }}Help',
|
||||
'helperId' => $id.'Help',
|
||||
'helper' => $helper
|
||||
])
|
||||
|
|
|
|||
|
|
@ -16,6 +16,6 @@ $data = [
|
|||
<div class="belongs-to-many-dropdown" data-json='@json($data)'></div>
|
||||
@include('modules.input-error', [
|
||||
'inputName' => $name,
|
||||
'helperId' => "{$id}Help",
|
||||
'helperId' => $id."Help",
|
||||
'helper' => $helper,
|
||||
])
|
||||
|
|
|
|||
|
|
@ -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.')
|
||||
])
|
||||
|
|
|
|||
|
|
@ -23,6 +23,6 @@ $data = [
|
|||
<div class="search-belongs-to-dropdown" data-json='@json($data)'></div>
|
||||
@include('modules.input-error', [
|
||||
'inputName' => $name,
|
||||
'helperId' => "{$id}Help",
|
||||
'helperId' => $id."Help",
|
||||
'helper' => $helper,
|
||||
])
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ $data = [
|
|||
<div class="ck-editor" data-json='@json($data)'></div>
|
||||
@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
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
<div class="list-item" data-json='@json($data)'></div>
|
||||
@include('modules.input-error', [
|
||||
'inputName' => $name,
|
||||
'helperId' => "{$id}Help",
|
||||
'helperId' => $id."Help",
|
||||
'helper' => $helper,
|
||||
])
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -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
|
||||
])
|
||||
|
|
|
|||
|
|
@ -10,5 +10,5 @@
|
|||
@if(old($name, (old('_token') ? false : ($model->{$name} ?? false)))) checked @endif>
|
||||
</div>
|
||||
@include('modules.input-error', [
|
||||
'inputName' => $name, 'helperId' => '{{ $id }}Help' , 'helper' => $helper
|
||||
'inputName' => $name, 'helperId' => $id."Help", 'helper' => $helper
|
||||
])
|
||||
|
|
|
|||
|
|
@ -10,6 +10,6 @@
|
|||
</select>
|
||||
@include('modules.input-error', [
|
||||
'inputName' => $name,
|
||||
'helperId' => "{{ $id }}Help",
|
||||
'helperId' => $id."Help",
|
||||
'helper' => $helper
|
||||
])
|
||||
|
|
|
|||
|
|
@ -22,6 +22,6 @@ $data = [
|
|||
<div class="input-text-auto" data-json='@json($data)'></div>
|
||||
@include('modules.input-error', [
|
||||
'inputName' => $name,
|
||||
'helperId' => "{$id}Help",
|
||||
'helperId' => $id."Help",
|
||||
'helper' => $helper
|
||||
])
|
||||
|
|
|
|||
|
|
@ -21,6 +21,6 @@
|
|||
@endif>
|
||||
@include('modules.input-error', [
|
||||
'inputName' => $name,
|
||||
'helperId' => $id.'Help',
|
||||
'helperId' => $id."Help",
|
||||
'helper' => $helper
|
||||
])
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@
|
|||
<a class="dropdown-item @if(Route::is('bo.ticket_types.*'))active @endif" href="{{ route('bo.ticket_types.index') }}">{{ trans_choice('models.classes.ticket_types', 2) }}</a>
|
||||
@endcan
|
||||
@can('isAdmin')
|
||||
<a class="dropdown-item @if(Route::is('bo.labels.*'))active @endif"href="{{ route('bo.labels.index') }}">{{ __('models.classes.labels') }}</a>
|
||||
<a class="dropdown-item @if(Route::is('bo.labels.*'))active @endif" href="{{ route('bo.labels.index') }}">{{ __('models.classes.labels') }}</a>
|
||||
@endcan
|
||||
</div>
|
||||
</li>
|
||||
|
|
@ -108,7 +108,7 @@
|
|||
{{ __('Identifiants') }}
|
||||
</a>
|
||||
|
||||
<form id="logout-form" class="dropdown-item" action="{{route('logout')}}" method="POST" class="d-none">
|
||||
<form id="logout-form" class="dropdown-item" action="{{route('logout')}}" method="POST">
|
||||
@csrf
|
||||
<button class="btn btn-link p-0 text-decoration-none text-body-secondary text-capitalize" type="submit">{{ __('Déconnexion') }}</button>
|
||||
</form>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue