DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-02 08:21:09 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Check for matching ID

Browse source 
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2025-01-20 16:53:48 +00:00
parent 713c9fdd6f
commit 5273408631
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/Importer/LocationImporter.php
View file

@ -39,12 +39,13 @@ class LocationImporter extends ItemImporter
$editingLocation = false; $editingLocation = false;
if ($this->findCsvMatch($row, 'id')!='') { $location = Location::where('name', '=', $this->findCsvMatch($row, 'name'))->first();
$location = Location::find($this->findCsvMatch($row, 'id'));
} else {
$location = Location::where('name', '=', $this->findCsvMatch($row, 'name'))->first();
}
if ($this->findCsvMatch($row, 'id')!='') {
// Override location if an ID was given
\Log::debug('Finding location by ID: '.$this->findCsvMatch($row, 'id'));
$location = Location::find($this->findCsvMatch($row, 'id'));
}
if ($location) { if ($location) {