kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-19 02:52:44 +00:00
Code Issues Projects Releases Wiki Activity

Improve fake import.

Browse Source
This commit is contained in:
James Cole
2018-05-04 06:59:14 +02:00
parent 6e84326583
commit b541f7b944
14 changed files with 387 additions and 565 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/Import/JobConfigurationController.php
View File

@@ -73,7 +73,7 @@ class JobConfigurationController extends Controller
$allowed = ['has_prereq', 'need_job_config', 'has_config'];
if (null !== $importJob && !in_array($importJob->status, $allowed)) {
Log::error('Job is not new but wants to do prerequisites');
session()->flash('error', trans('import.bad_job_status'));
session()->flash('error', trans('import.bad_job_status', ['status' => $importJob->status]));
return redirect(route('import.index'));
}
@@ -101,7 +101,7 @@ class JobConfigurationController extends Controller
$view = $configurator->getNextView();
$data = $configurator->getNextData();
$subTitle = trans('firefly.import_config_bread_crumb');
$subTitle = trans('import.job_configuration_breadcrumb', ['key' => $importJob->key]);
$subTitleIcon = 'fa-wrench';
return view($view, compact('data', 'importJob', 'subTitle', 'subTitleIcon'));
@@ -123,7 +123,7 @@ class JobConfigurationController extends Controller
$allowed = ['has_prereq', 'need_job_config', 'has_config'];
if (null !== $importJob && !in_array($importJob->status, $allowed)) {
Log::error('Job is not new but wants to do prerequisites');
session()->flash('error', trans('import.bad_job_status'));
session()->flash('error', trans('import.bad_job_status', ['status' => $importJob->status]));
return redirect(route('import.index'));
}