lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Only show importer progress if on command line. It broke error display from web.

Browse source
This commit is contained in:
Daniel Meltzer 2016-06-19 23:56:10 -04:00
parent 8c00bad6d0
commit d6dd449445
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -103,8 +103,10 @@ class ObjectImportCommand extends Command {
$this->accessories = Accessory::All(['name']); $this->accessories = Accessory::All(['name']);
$this->consumables = Consumable::All(['name']); $this->consumables = Consumable::All(['name']);
$this->customfields = CustomField::All(['name']); $this->customfields = CustomField::All(['name']);
$bar = NULL;
$bar = $this->output->createProgressBar(count($newarray)); if(!$this->option('web-importer')) {
$bar = $this->output->createProgressBar(count($newarray));
}
// Loop through the records // Loop through the records
DB::transaction(function() use (&$newarray, $bar){ DB::transaction(function() use (&$newarray, $bar){
Model::unguard(); Model::unguard();
@ -180,12 +182,16 @@ class ObjectImportCommand extends Command {
break; break;
} }
$bar->advance(); if(!$this->option('web-importer')) {
$bar->advance();
}
$this->log('------------- Action Summary ----------------'); $this->log('------------- Action Summary ----------------');
} }
}); });
$bar->finish(); if(!$this->option('web-importer')) {
$bar->finish();
}
$this->log('====================================='); $this->log('=====================================');