ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #17978 from marcusmoore/17205-replace-form-email-format

Browse Source 
Fixed #17205 - replace Form:: email_format
This commit is contained in:
snipe
2025-10-03 09:15:49 +01:00
committed by GitHub
parent 6b9839367f 03fd8df8bd
commit 6cf88b1792
3 changed files with 33 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/macros/macros.php
-26
View File
@@ -151,32 +151,6 @@ Form::macro('barcode_types', function ($name = 'barcode_type', $selected = null,
return $select;
});
Form::macro('email_format', function ($name = 'email_format', $selected = null, $class = null) {
$formats = [
'firstname.lastname' => trans('admin/settings/general.email_formats.firstname_lastname_format'),
'firstname' => trans('admin/settings/general.email_formats.first_name_format'),
'lastname' => trans('admin/settings/general.email_formats.last_name_format'),
'filastname' => trans('admin/settings/general.email_formats.filastname_format'),
'lastnamefirstinitial' => trans('admin/settings/general.email_formats.lastnamefirstinitial_format'),
'firstname_lastname' => trans('admin/settings/general.email_formats.firstname_lastname_underscore_format'),
'firstinitial.lastname' => trans('admin/settings/general.email_formats.firstinitial_lastname'),
'lastname_firstinitial' => trans('admin/settings/general.email_formats.lastname_firstinitial'),
'lastname.firstinitial' => trans('admin/settings/general.email_formats.lastname_dot_firstinitial_format'),
'firstnamelastname' => trans('admin/settings/general.email_formats.firstnamelastname'),
'firstnamelastinitial' => trans('admin/settings/general.email_formats.firstnamelastinitial'),
'lastname.firstname' => trans('admin/settings/general.email_formats.lastnamefirstname'),
];
$select = '<select name="'.$name.'" class="'.$class.'" style="width: 100%" aria-label="'.$name.'">';
foreach ($formats as $format => $label) {
$select .= '<option value="'.$format.'"'.($selected == $format ? ' selected="selected" role="option" aria-selected="true"' : ' aria-selected="false"').'>'.$label.'</option> '."\n";
}
$select .= '</select>';
return $select;
});
Form::macro('username_format', function ($name = 'username_format', $selected = null, $class = null) {
$formats = [
'firstname.lastname' => trans('admin/settings/general.username_formats.firstname_lastname_format'),
resources/views/blade/input/email-format-select.blade.php
+27
View File
@@ -0,0 +1,27 @@
@php
$formats = [
'firstname.lastname' => trans('admin/settings/general.email_formats.firstname_lastname_format'),
'firstname' => trans('admin/settings/general.email_formats.first_name_format'),
'lastname' => trans('admin/settings/general.email_formats.last_name_format'),
'filastname' => trans('admin/settings/general.email_formats.filastname_format'),
'lastnamefirstinitial' => trans('admin/settings/general.email_formats.lastnamefirstinitial_format'),
'firstname_lastname' => trans('admin/settings/general.email_formats.firstname_lastname_underscore_format'),
'firstinitial.lastname' => trans('admin/settings/general.email_formats.firstinitial_lastname'),
'lastname_firstinitial' => trans('admin/settings/general.email_formats.lastname_firstinitial'),
'lastname.firstinitial' => trans('admin/settings/general.email_formats.lastname_dot_firstinitial_format'),
'firstnamelastname' => trans('admin/settings/general.email_formats.firstnamelastname'),
'firstnamelastinitial' => trans('admin/settings/general.email_formats.firstnamelastinitial'),
'lastname.firstname' => trans('admin/settings/general.email_formats.lastnamefirstname'),
];
@endphp
<x-input.select {{ $attributes }}>
@foreach($formats as $format => $label)
<option
value="{{ $format }}"
@selected($selected == $format)
>
{{ $label }}
</option>
@endforeach
</x-input.select>
resources/views/settings/general.blade.php
+6 -1
View File
@@ -87,7 +87,12 @@
<label for="email_format">{{ trans('admin/settings/general.email_formats.email_format') }}</label>
</div>
<div class="col-md-8">
{!! Form::email_format('email_format', old('email_format', $setting->email_format), 'select2') !!}
<x-input.email-format-select
name="email_format"
:selected="old('email_format', $setting->email_format)"
style="width: 100%"
aria-label="email_format"
/>
{!! $errors->first('email_format', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div>
</div>