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

Check for an existing username before getting creative. Fixes #6016 (#6039)

Browse source
This commit is contained in:
Daniel Meltzer 2018-08-03 19:35:13 -04:00 • committed by snipe
parent 1a660911e7
commit 2d0df24ef3
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/Importer/Importer.php
View file

@ -272,6 +272,13 @@ abstract class Importer
'email' => $this->findCsvMatch($row, "email"), 'email' => $this->findCsvMatch($row, "email"),
'username' => $this->findCsvMatch($row, "username") 'username' => $this->findCsvMatch($row, "username")
]; ];
// Maybe we're lucky and the user already exists.
if($user = User::where('username', $user_array['username'])->first()) {
$this->log('User '.$user_array['username'].' already exists');
return $user;
}
// If the full name is empty, bail out--we need this to extract first name (at the very least) // If the full name is empty, bail out--we need this to extract first name (at the very least)
if(empty($user_array['full_name'])) { if(empty($user_array['full_name'])) {
$this->log('Insufficient user data provided (Full name is required)- skipping user creation, just adding asset'); $this->log('Insufficient user data provided (Full name is required)- skipping user creation, just adding asset');