IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix error when not-existing import job is submitted.

Browse Source
This commit is contained in:
James Cole 2017-02-26 11:48:38 +01:00
parent 2116486fe0
commit b23eb07018
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Console/Commands/CreateImport.php
View File

@ -84,7 +84,7 @@ class CreateImport extends Command
$job = $jobRepository->create($type); $job = $jobRepository->create($type);
$this->line(sprintf('Created job "%s"...', $job->key)); $this->line(sprintf('Created job "%s"...', $job->key));
Artisan::call('firefly:encrypt', ['file' => $file, 'key' => $job->key]); Artisan::call('firefly:encrypt-file', ['file' => $file, 'key' => $job->key]);
$this->line('Stored import data...'); $this->line('Stored import data...');
$job->configuration = $configurationData; $job->configuration = $configurationData;

3
app/Console/Commands/Import.php
View File

@ -59,6 +59,9 @@ class Import extends Command
Log::debug('Start start-import command'); Log::debug('Start start-import command');
$jobKey = $this->argument('key'); $jobKey = $this->argument('key');
$job = ImportJob::whereKey($jobKey)->first(); $job = ImportJob::whereKey($jobKey)->first();
if (is_null($job)) {
$this->error(sprintf('No job found with key "%s"', $jobKey));
}
if (!$this->isValid($job)) { if (!$this->isValid($job)) {
Log::error('Job is not valid for some reason. Exit.'); Log::error('Job is not valid for some reason. Exit.');