DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-09 23:24:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2020-11-24 16:06:01 -08:00
parent 74b26a349c c0d7564658
commit bf1f8659cb
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/Console/Commands/ImportLocations.php
View file

@ -88,11 +88,13 @@ class ImportLocations extends Command
if (array_key_exists('Parent Name', $row)) { if (array_key_exists('Parent Name', $row)) {
$parent_name = trim($row['Parent Name']); $parent_name = trim($row['Parent Name']);
} else {
$parent_name = null;
} }
// Set the location attributes to save // Set the location attributes to save
if (array_key_exists('Name', $row)) { if (array_key_exists('Name', $row)) {
$location = Location::firstOrNew(array('name' => trim($row['Name']))); $location = Location::firstOrCreate(array('name' => trim($row['Name'])));
$location->name = trim($row['Name']); $location->name = trim($row['Name']);
$this->info('Checking location: '.$location->name); $this->info('Checking location: '.$location->name);
} else { } else {