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

This should fix the tests.

Browse Source
This commit is contained in:
James Cole
2016-02-23 17:55:56 +01:00
parent dad73ce9df
commit 35863c8d3a
2 changed files with 103 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -217,9 +217,10 @@ class CsvController extends Controller
}
// process given roles and mapping:
$inputMap = Input::get('map') ?? [];
$roles = $this->wizard->processSelectedRoles(Input::get('role'));
$maps = $this->wizard->processSelectedMapping($roles, $inputMap);
$inputMap = Input::get('map') ?? [];
$inputRoles = Input::get('role') ?? [];
$roles = $this->wizard->processSelectedRoles($inputRoles);
$maps = $this->wizard->processSelectedMapping($roles, $inputMap);
Session::put('csv-map', $maps);
Session::put('csv-roles', $roles);
@@ -312,7 +313,8 @@ class CsvController extends Controller
}
Log::debug('Created importer');
$importer = new Importer;
/** @var Importer $importer */
$importer = app('FireflyIII\Helpers\Csv\Importer');
$importer->setData($this->data);
$importer->run();
Log::debug('Done importing!');