DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-11 05:47:28 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v3' into v3-master

Browse source
This commit is contained in:
snipe 2016-06-22 14:19:30 -07:00
parent 6673a5afe1 65dfd23021
commit 2df3e95efc
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/Console/Commands/ObjectImportCommand.php
View file

@ -340,7 +340,7 @@ class ObjectImportCommand extends Command
$this->log('Asset Model ' . $asset_model_name . ' with model number ' . $asset_modelno . ' was created'); $this->log('Asset Model ' . $asset_model_name . ' with model number ' . $asset_modelno . ' was created');
return $asset_model; return $asset_model;
} else { } else {
$this->jsonError('Asset Model', $asset_model->getErrors()); $this->jsonError('Asset Model ' . $asset_model_name, $asset_model->getErrors());
return $asset_model; return $asset_model;
} }
} else { } else {
@ -387,7 +387,7 @@ class ObjectImportCommand extends Command
$this->log('Category ' . $asset_category . ' was created'); $this->log('Category ' . $asset_category . ' was created');
return $category; return $category;
} else { } else {
$this->jsonError('Category', $category->getErrors()); $this->jsonError('Category '. $asset_category, $category->getErrors());
return $category; return $category;
} }
} else { } else {
@ -462,7 +462,7 @@ class ObjectImportCommand extends Command
$this->log('Status ' . $asset_statuslabel_name . ' was created'); $this->log('Status ' . $asset_statuslabel_name . ' was created');
return $status; return $status;
} else { } else {
$this->jsonError('Status', $status->getErrors()); $this->jsonError('Status '. $asset_statuslabel_name, $status->getErrors());
return $status; return $status;
} }
} else { } else {
@ -511,7 +511,7 @@ class ObjectImportCommand extends Command
$this->log('Manufacturer ' . $manufacturer->name . ' was created'); $this->log('Manufacturer ' . $manufacturer->name . ' was created');
return $manufacturer; return $manufacturer;
} else { } else {
$this->jsonError('Manufacturer', $manufacturer->getErrors()); $this->jsonError('Manufacturer '. $manufacturer->name, $manufacturer->getErrors());
return $manufacturer; return $manufacturer;
} }