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

Fixed merge error parse error

Browse source 
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2021-10-20 18:11:34 -07:00
parent 6e0f8068b2
commit 31d49b5c9b
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/Importer/UserImporter.php
View file

@ -120,7 +120,7 @@ class UserImporter extends ItemImporter
*/ */
public function createOrFetchDepartment($department_name) public function createOrFetchDepartment($department_name)
{ {
if (is_null($department_name) || $department_name == ''){
return null; return null;
} }
@ -128,7 +128,6 @@ class UserImporter extends ItemImporter
$department = Department::where(['name' => $department_name])->first(); $department = Department::where(['name' => $department_name])->first();
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;
} }
@ -138,15 +137,14 @@ class UserImporter extends ItemImporter
if ($department->save()) { if ($department->save()) {
$this->log('department ' . $department_name . ' was created'); $this->log('department ' . $department_name . ' was created');
return $department->id; return $department->id;
} }
$this->logError($department, 'Department'); $this->logError($department, 'Department');
return null; return null;
} }
public function sendWelcome($send = true) public function sendWelcome($send = true)
{ {
$this->send_welcome = $send; $this->send_welcome = $send;