DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 13:44:06 -08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Fix License Import. (#4121)

Browse source 
The license name is not unique, so keying by license alone was causing issues.  Match using name + serial instead.
This commit is contained in:
Daniel Meltzer 2017-10-03 11:46:06 -04:00 committed by snipe
parent d303cbd7cb
commit d119372ff0
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/Importer/LicenseImporter.php
View file

@ -33,10 +33,12 @@ class LicenseImporter extends ItemImporter
public function createLicenseIfNotExists(array $row) public function createLicenseIfNotExists(array $row)
{ {
$editingLicense = false; $editingLicense = false;
$license = License::where('name', $this->item['name'])->first(); $license = License::where('name', $this->item['name'])
->where('serial', $this->item['serial'])
->first();
if ($license) { if ($license) {
if (!$this->updating) { if (!$this->updating) {
$this->log('A matching License ' . $this->item['name'] . ' already exists'); $this->log('A matching License ' . $this->item['name'] . 'with serial ' . $this->item['serial'] . ' already exists');
return; return;
} }