Skip to content

A free open source IT asset/license management system

Migrate username format to blade component

Marcus Moore6f89af790e21
diff --git a/resources/views/blade/input/username-select.blade.php b/resources/views/blade/input/username-select.blade.php
new file mode 100644
index 0000000000..a169204592
--- /dev/null
+++ b/resources/views/blade/input/username-select.blade.php
@@ -0,0 +1,27 @@
+@php
+ $formats = [
+ 'firstname.lastname' => trans('admin/settings/general.username_formats.firstname_lastname_format'),
+ 'firstname' => trans('admin/settings/general.username_formats.first_name_format'),
+ 'lastname' => trans('admin/settings/general.username_formats.last_name_format'),
+ 'filastname' => trans('admin/settings/general.username_formats.filastname_format'),
+ 'lastnamefirstinitial' => trans('admin/settings/general.username_formats.lastnamefirstinitial_format'),
+ 'firstname_lastname' => trans('admin/settings/general.username_formats.firstname_lastname_underscore_format'),
+ 'firstinitial.lastname' => trans('admin/settings/general.username_formats.firstinitial_lastname'),
+ 'lastname_firstinitial' => trans('admin/settings/general.username_formats.lastname_firstinitial'),
+ 'lastname.firstinitial' => trans('admin/settings/general.username_formats.lastname_dot_firstinitial_format'),
+ 'firstnamelastname' => trans('admin/settings/general.username_formats.firstnamelastname'),
+ 'firstnamelastinitial' => trans('admin/settings/general.username_formats.firstnamelastinitial'),
+ 'lastname.firstname' => trans('admin/settings/general.username_formats.lastnamefirstname'),
+ ];
+@endphp
+
+<x-input.select {{ $attributes }}>
+ @foreach($formats as $format => $label)
+ <option
+ value="{{ $format }}"
+ @selected($selected == $format)
+ >
+ {{ $label }}
+ </option>
+ @endforeach
+</x-input.select>
diff --git a/resources/views/settings/general.blade.php b/resources/views/settings/general.blade.php
index b0353192eb..0501b2e5d4 100644
--- a/resources/views/settings/general.blade.php
+++ b/resources/views/settings/general.blade.php
@@ -102,7 +102,12 @@
<label for="username_format" class="col-md-3 control-label">{{ trans('admin/settings/general.username_formats.username_format') }}</label>
<div class="col-md-8">
- {!! Form::username_format('username_format', old('username_format', $setting->username_format), 'select2') !!}
+ <x-input.username-select
+ name="username_format"
+ :selected="old('username_format', $setting->username_format)"
+ style="width: 100%"
+ aria-label="username_format"
+ />
{!! $errors->first('username_format', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
<p class="help-block">