DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -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-05-16 16:42:17 -07:00
parent 37f75c5001 4ca914d773
commit 5be993df8d
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/Importer/ItemImporter.php
View file

@ -103,19 +103,19 @@ class ItemImporter extends Importer
/** /**
* Parse row to determine what (if anything) we should checkout to. * Parse row to determine what (if anything) we should checkout to.
* @param array $row CSV Row being parsed * @param array $row CSV Row being parsed
* @return SnipeModel Model to be checked out to * @return ?SnipeModel Model to be checked out to
*/ */
protected function determineCheckout($row) protected function determineCheckout($row)
{ {
if (get_class($this) == LocationImporter::class) {
return;
}
// We only support checkout-to-location for asset, so short circuit otherwise. // We only support checkout-to-location for asset, so short circuit otherwise.
if (get_class($this) != AssetImporter::class) { if (get_class($this) != AssetImporter::class) {
return $this->createOrFetchUser($row); return $this->createOrFetchUser($row);
} }
if (get_class($this) != LocationImporter::class) {
return;
}
if (strtolower($this->item['checkout_class']) === 'location' && $this->findCsvMatch($row, 'checkout_location') != null ) { if (strtolower($this->item['checkout_class']) === 'location' && $this->findCsvMatch($row, 'checkout_location') != null ) {
return Location::findOrFail($this->createOrFetchLocation($this->findCsvMatch($row, 'checkout_location'))); return Location::findOrFail($this->createOrFetchLocation($this->findCsvMatch($row, 'checkout_location')));
} }