DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-03 09:57:45 -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 2023-10-16 23:15:05 +01:00
parent 55d0c4021d 1e0512ad44
commit 73ec84903e
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/Console/Commands/LdapSync.php
View file

@ -108,15 +108,19 @@ class LdapSync extends Command
$location = null; // TODO - this would be better called "$default_location", which is more explicit about its purpose $location = null; // TODO - this would be better called "$default_location", which is more explicit about its purpose
if ($this->option('location') != '') { if ($this->option('location') != '') {
$location = Location::where('name', '=', $this->option('location'))->first(); if ($location = Location::where('name', '=', $this->option('location'))->first()) {
Log::debug('Location name '.$this->option('location').' passed'); Log::debug('Location name '.$this->option('location').' passed');
Log::debug('Importing to '.$location->name.' ('.$location->id.')'); Log::debug('Importing to '.$location->name.' ('.$location->id.')');
}
} elseif ($this->option('location_id') != '') { } elseif ($this->option('location_id') != '') {
$location = Location::where('id', '=', $this->option('location_id'))->first(); if ($location = Location::where('id', '=', $this->option('location_id'))->first()) {
Log::debug('Location ID '.$this->option('location_id').' passed'); Log::debug('Location ID '.$this->option('location_id').' passed');
Log::debug('Importing to '.$location->name.' ('.$location->id.')'); Log::debug('Importing to '.$location->name.' ('.$location->id.')');
} }
}
if (! isset($location)) { if (! isset($location)) {
Log::debug('That location is invalid or a location was not provided, so no location will be assigned by default.'); Log::debug('That location is invalid or a location was not provided, so no location will be assigned by default.');
} }