DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-24 05:04:07 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'hotfixes/use_modelno_if_no_name_in_import' into develop

Browse source
This commit is contained in:
snipe 2016-10-25 03:53:45 -07:00
parent 85f3cc1762 2dbd1089f5
commit 59ce46dce7
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -322,7 +322,9 @@ class ObjectImportCommand extends Command
$asset_model_name = $this->array_smart_fetch($row, "model name"); $asset_model_name = $this->array_smart_fetch($row, "model name");
$asset_modelno = $this->array_smart_fetch($row, "model number"); $asset_modelno = $this->array_smart_fetch($row, "model number");
if (empty($asset_model_name)) { if ((empty($asset_model_name)) && (!empty($asset_modelno))) {
$asset_model_name = $asset_modelno;
} elseif ((empty($asset_model_name)) && (empty($asset_modelno))) {
$asset_model_name ='Unknown'; $asset_model_name ='Unknown';
} }
if (empty($asset_modelno)) { if (empty($asset_modelno)) {