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

Optimized some code.

Browse Source
This commit is contained in:
James Cole
2015-07-06 22:12:35 +02:00
parent 516725456f
commit d67db74ca2
8 changed files with 375 additions and 366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -229,16 +229,13 @@ class CsvController extends Controller
public function map()
{
/*
* 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'];
if (!$this->wizard->sessionHasValues($fields)) {
Session::flash('warning', 'Could not recover upload.');
return redirect(route('csv.index'));
}
/*
* The "options" array contains all options the user has
* per column, where the key represents the column.
@@ -246,10 +243,8 @@ class CsvController extends Controller
* For each key there is an array which in turn represents
* all the options available: grouped by ID.
*
* Aka:
*
* options[column index] = [
* field id => field identifier.
* field id => field identifier.
* ]
*/
try {
@@ -258,9 +253,7 @@ class CsvController extends Controller
return view('error', ['message' => $e->getMessage()]);
}
/*
* After these values are prepped, read the actual CSV file
*/
// After these values are prepped, read the actual CSV file
$reader = $this->data->getReader();
$map = $this->data->getMap();
$hasHeaders = $this->data->getHasHeaders();