DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-26 22:19:41 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge pull request #13344 from snipe/fixes/added_manufacturer_to_licenses

Browse source 
Fixes bug/sc-23509: Added manufacturer back into license importer
This commit is contained in:
snipe 2023-07-20 14:05:19 +01:00 committed by GitHub
parent 917005ceb4 d7ac8ef618
commit ee36497acf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -286,6 +286,7 @@ class Importer extends Component
'serial' => trans('general.license_serial'), 'serial' => trans('general.license_serial'),
'email' => trans('general.importer.checked_out_to_email'), 'email' => trans('general.importer.checked_out_to_email'),
'username' => trans('general.importer.checked_out_to_username'), 'username' => trans('general.importer.checked_out_to_username'),
'manufacturer' => trans('general.manufacturer'),
]; ];
$this->users_fields = [ $this->users_fields = [

2
app/Importer/LicenseImporter.php
View file

@ -66,6 +66,8 @@ class LicenseImporter extends ItemImporter
$this->item['maintained'] = $this->findCsvMatch($row, 'maintained'); $this->item['maintained'] = $this->findCsvMatch($row, 'maintained');
$this->item['purchase_order'] = $this->findCsvMatch($row, 'purchase_order'); $this->item['purchase_order'] = $this->findCsvMatch($row, 'purchase_order');
$this->item['reassignable'] = $this->findCsvMatch($row, 'reassignable'); $this->item['reassignable'] = $this->findCsvMatch($row, 'reassignable');
$this->item['manufacturer'] = $this->createOrFetchManufacturer($this->findCsvMatch($row, 'manufacturer'));
if($this->item['reassignable'] == "") if($this->item['reassignable'] == "")
{ {
$this->item['reassignable'] = 1; $this->item['reassignable'] = 1;