DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-12 14:27:33 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #14319 from snipe/fixes/RB-17889

Browse source 
Check for activeFile before trying to get header on import
This commit is contained in:
snipe 2024-02-23 08:19:21 +00:00 committed by GitHub
parent e494a2670f f04aeb9f2b
commit 3271d020e9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/Http/Livewire/Importer.php
View file

@ -59,12 +59,21 @@ class Importer extends Component
'field_map' => 'array' 'field_map' => 'array'
]; ];
/**
* This is used in resources/views/livewire/importer.blade.php, and we kinda shouldn't need to check for
* activeFile here, but there's some UI goofiness that allows this to crash out on some imports.
*
* @return string
*/
public function generate_field_map() public function generate_field_map()
{ {
\Log::debug("header row is: ".print_r($this->activeFile->header_row,true)); $tmp = array();
\Log::debug("Field map is: ".print_r($this->field_map,true)); if ($this->activeFile) {
$tmp = array_combine($this->activeFile->header_row, $this->field_map); $tmp = array_combine($this->activeFile->header_row, $this->field_map);
return json_encode(array_filter($tmp)); $tmp = array_filter($tmp);
}
return json_encode($tmp);
} }