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

Also check for CSV delimiter presence.

Browse Source
This commit is contained in:
James Cole
2016-01-22 20:43:44 +01:00
parent b5fbc8b632
commit f710677cdc
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,7 +57,7 @@ class CsvController extends Controller
public function columnRoles() 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', 'csv-delimiter'];
if (!$this->wizard->sessionHasValues($fields)) { if (!$this->wizard->sessionHasValues($fields)) {
Session::flash('warning', 'Could not recover upload.'); Session::flash('warning', 'Could not recover upload.');
@@ -97,7 +97,7 @@ class CsvController extends Controller
*/ */
public function downloadConfig() public function downloadConfig()
{ {
$fields = ['csv-date-format', 'csv-has-headers']; $fields = ['csv-date-format', 'csv-has-headers', 'csv-delimiter'];
if (!$this->wizard->sessionHasValues($fields)) { if (!$this->wizard->sessionHasValues($fields)) {
Session::flash('warning', 'Could not recover upload.'); Session::flash('warning', 'Could not recover upload.');
@@ -196,7 +196,7 @@ class CsvController extends Controller
*/ */
public function initialParse() public function initialParse()
{ {
$fields = ['csv-file', 'csv-date-format', 'csv-has-headers']; $fields = ['csv-file', 'csv-date-format', 'csv-has-headers', 'csv-delimiter'];
if (!$this->wizard->sessionHasValues($fields)) { if (!$this->wizard->sessionHasValues($fields)) {
Session::flash('warning', 'Could not recover upload.'); Session::flash('warning', 'Could not recover upload.');
@@ -246,7 +246,7 @@ class CsvController extends Controller
{ {
// Make sure all fields we need are accounted for. // Make sure all fields we need are accounted for.
$fields = ['csv-file', 'csv-date-format', 'csv-has-headers', 'csv-map', 'csv-roles']; $fields = ['csv-file', 'csv-date-format', 'csv-has-headers', 'csv-map', 'csv-roles', 'csv-delimiter'];
if (!$this->wizard->sessionHasValues($fields)) { if (!$this->wizard->sessionHasValues($fields)) {
Session::flash('warning', 'Could not recover upload.'); Session::flash('warning', 'Could not recover upload.');
@@ -294,7 +294,7 @@ class CsvController extends Controller
/* /*
* Make sure all fields we need are accounted for. * Make sure all fields we need are accounted for.
*/ */
$fields = ['csv-file', 'csv-date-format', 'csv-has-headers', 'csv-map', 'csv-roles', 'csv-mapped']; $fields = ['csv-file', 'csv-date-format', 'csv-has-headers', 'csv-map', 'csv-roles', 'csv-mapped', 'csv-delimiter'];
if (!$this->wizard->sessionHasValues($fields)) { if (!$this->wizard->sessionHasValues($fields)) {
Session::flash('warning', 'Could not recover upload.'); Session::flash('warning', 'Could not recover upload.');
@@ -340,7 +340,7 @@ class CsvController extends Controller
/* /*
* Make sure all fields we need are accounted for. * Make sure all fields we need are accounted for.
*/ */
$fields = ['csv-file', 'csv-date-format', 'csv-has-headers', 'csv-map', 'csv-roles']; $fields = ['csv-file', 'csv-date-format', 'csv-has-headers', 'csv-map', 'csv-roles', 'csv-delimiter'];
if (!$this->wizard->sessionHasValues($fields)) { if (!$this->wizard->sessionHasValues($fields)) {
Session::flash('warning', 'Could not recover upload.'); Session::flash('warning', 'Could not recover upload.');