lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Aliases could get selected when they weren't for an import_type

Browse source
This commit is contained in:
Brady Wetherington 2023-03-08 13:56:29 -08:00
parent ac0b22d696
commit 22d7d2a04e
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/Http/Livewire/ImporterFile.php
View file

@ -172,8 +172,13 @@ class ImporterFile extends Component
foreach(self::$aliases as $key => $alias_values) { foreach(self::$aliases as $key => $alias_values) {
foreach($alias_values as $alias_value) { foreach($alias_values as $alias_value) {
if (strcasecmp($alias_value,$header) === 0) { // aLsO CaSe-INSENSitiVE! if (strcasecmp($alias_value,$header) === 0) { // aLsO CaSe-INSENSitiVE!
$this->field_map[$i] = $key; // Make *absolutely* sure that this key actually _exists_ in this import type -
continue 3; // bust out of both of these loops; as well as the surrounding one - e.g. move on to the next header // you can trigger this by importing accessories with a 'Warranty' column (which don't exist
// in "Accessories"!)
if (array_key_exists($key, $this->columnOptions[$new_import_type])) {
$this->field_map[$i] = $key;
continue 3; // bust out of both of these loops; as well as the surrounding one - e.g. move on to the next header
}
} }
} }
} }