kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-12 12:48:17 +00:00
Code Issues Projects Releases Wiki Activity

Better import feedback.

Browse Source
This commit is contained in:
James Cole
2015-07-09 18:38:15 +02:00
parent 9c9fc2b5dc
commit f15267c1ab
3 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Controllers/CsvController.php
View File

@@ -57,7 +57,7 @@ class CsvController extends Controller
public function columnRoles()
{
$fields = ['csv-file', 'csv-date-format', 'csv-has-headers','csv-import-account'];
$fields = ['csv-file', 'csv-date-format', 'csv-has-headers', 'csv-import-account'];
if (!$this->wizard->sessionHasValues($fields)) {
Session::flash('warning', 'Could not recover upload.');
@@ -302,12 +302,13 @@ class CsvController extends Controller
$rows = $importer->getRows();
$errors = $importer->getErrors();
$imported = $importer->getImported();
$journals = $importer->getJournals();
Preferences::mark();
$subTitle = trans('firefly.csv_process_title');
return view('csv.process', compact('rows', 'errors', 'imported', 'subTitle'));
return view('csv.process', compact('rows', 'errors', 'imported', 'subTitle', 'journals'));
}