mirror of
https://github.com/snipe/snipe-it.git
synced 2024-12-25 05:34:06 -08:00
Merge branch 'develop' into snipeit_v7_laravel10
This commit is contained in:
commit
3d5847f4b3
|
@ -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
|
||||
|
||||
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('Importing to '.$location->name.' ('.$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('Importing to '.$location->name.' ('.$location->id.')');
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if (! isset($location)) {
|
||||
Log::debug('That location is invalid or a location was not provided, so no location will be assigned by default.');
|
||||
}
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
<?php
|
||||
return array (
|
||||
'app_version' => 'v6.2.2',
|
||||
'full_app_version' => 'v6.2.2 - build 11714-ga95fae0e9',
|
||||
'build_version' => '11714',
|
||||
'app_version' => 'v6.2.3',
|
||||
'full_app_version' => 'v6.2.3 - build 11759-g8c4bf74f9',
|
||||
'build_version' => '11759',
|
||||
'prerelease_version' => '',
|
||||
'hash_version' => 'ga95fae0e9',
|
||||
'full_hash' => 'v6.2.2-85-ga95fae0e9',
|
||||
'hash_version' => 'g8c4bf74f9',
|
||||
'full_hash' => 'v6.2.3-42-g8c4bf74f9',
|
||||
'branch' => 'develop',
|
||||
);
|
Loading…
Reference in a new issue