lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

adding last name only as a email choice

Browse source
This commit is contained in:
akemidx 2025-04-03 23:34:04 -04:00
parent ba621cb1f2
commit f0bf77735d
4 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Models/User.php
View file

@ -622,6 +622,8 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
$username = str_slug($first_name).'_'.str_slug($last_name);
} elseif ($format == 'firstname') {
$username = str_slug($first_name);
} elseif ($format == 'lastname') {
$username = str_slug($last_name);
} elseif ($format == 'firstinitial.lastname') {
$username = str_slug(substr($first_name, 0, 1).'.'.str_slug($last_name));
} elseif ($format == 'lastname_firstinitial') {

1
resources/lang/en-US/general.php
View file

@ -185,6 +185,7 @@ return [
'last' => 'Last',
'last_login' => 'Last Login',
'last_name' => 'Last Name',
'last_name_format' => 'Last Name (doe@example.com)',
'license' => 'License',
'license_report' => 'License Report',
'licenses_available' => 'Licenses available',

1
resources/macros/macros.php
View file

@ -193,6 +193,7 @@ Form::macro('username_format', function ($name = 'username_format', $selected =
$formats = [
'firstname.lastname' => trans('general.firstname_lastname_format'),
'firstname' => trans('general.first_name_format'),
'lastname' => trans('general.last_name_format'),
'filastname' => trans('general.filastname_format'),
'lastnamefirstinitial' => trans('general.lastnamefirstinitial_format'),
'firstname_lastname' => trans('general.firstname_lastname_underscore_format'),

8
tests/Unit/UserTest.php
View file

@ -24,6 +24,14 @@ class UserTest extends TestCase
$this->assertEquals($expected_username, $user['username']);
}
public function testLastName()
{
$fullname = "Natalia Allanovna Romanova-O'Shostakova";
$expected_username = 'allanovna-romanova-oshostakova';
$user = User::generateFormattedNameFromFullName($fullname, 'lastname');
$this->assertEquals($expected_username, $user['username']);
}
public function testFirstNameDotLastName()
{
$fullname = "Natalia Allanovna Romanova-O'Shostakova";