DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-21 03:15:45 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Added a clause that lets the function that updates the department to fail gracefully if no dept. name is provided in the CSV passed to the Importer. (#9078)

Browse source
This commit is contained in:
Ivan Nieto 2021-02-02 14:23:36 -06:00 committed by GitHub
parent ef668317a9
commit df4686bc96
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/Importer/UserImporter.php
View file

@ -125,7 +125,10 @@ class UserImporter extends ItemImporter
if ($department) { if ($department) {
$this->log('A matching department ' . $department_name . ' already exists'); $this->log('A matching department ' . $department_name . ' already exists');
return $department->id; return $department->id;
} else {
return null;
} }
$department = new department(); $department = new department();
$department->name = $department_name; $department->name = $department_name;
$department->user_id = $this->user_id; $department->user_id = $this->user_id;
@ -134,7 +137,8 @@ class UserImporter extends ItemImporter
$this->log('department ' . $department_name . ' was created'); $this->log('department ' . $department_name . ' was created');
return $department->id; return $department->id;
} }
$this->logError($department, 'Company');
$this->logError($department, 'Department');
return null; return null;
} }