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

More consistent error handling.

Browse Source
This commit is contained in:
James Cole
2016-02-06 05:01:34 +01:00
parent 69d0c31ae5
commit 241190c4da
7 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,6 +3,7 @@
use Amount;
use Auth;
use Carbon\Carbon;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Http\Requests\BudgetFormRequest;
use FireflyIII\Models\Budget;
use FireflyIII\Models\LimitRepetition;
@@ -224,16 +225,15 @@ class BudgetController extends Controller
/**
* @param BudgetRepositoryInterface $repository
* @param Budget $budget
* @param LimitRepetition $repetition
* @param LimitRepetition|null $repetition
*
* @return \Illuminate\View\View
* @return View
* @throws FireflyException
*/
public function show(BudgetRepositoryInterface $repository, Budget $budget, LimitRepetition $repetition = null)
{
if (!is_null($repetition->id) && $repetition->budgetLimit->budget->id != $budget->id) {
$message = 'Invalid selection.';
return view('error', compact('message'));
throw new FireflyException('This budget limit is not part of this budget.');
}
$journals = $repository->getJournals($budget, $repetition, 50);

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

@@ -278,13 +278,7 @@ class CsvController extends Controller
* field id => field identifier.
* ]
*/
try {
$options = $this->wizard->showOptions($this->data->getMap());
} catch (FireflyException $e) {
Log::error($e->getMessage());
return view('error', ['message' => $e->getMessage()]);
}
$options = $this->wizard->showOptions($this->data->getMap());
// After these values are prepped, read the actual CSV file
$reader = $this->data->getReader();
@@ -321,13 +315,7 @@ class CsvController extends Controller
Log::debug('Created importer');
$importer = new Importer;
$importer->setData($this->data);
try {
$importer->run();
} catch (FireflyException $e) {
Log::error('Catch error: ' . $e->getMessage());
return view('error', ['message' => $e->getMessage()]);
}
$importer->run();
Log::debug('Done importing!');
$rows = $importer->getRows();

4
app/Http/Controllers/ReportController.php
View File

@@ -1,6 +1,7 @@
<?php namespace FireflyIII\Http\Controllers;
use Carbon\Carbon;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Helpers\Report\ReportHelperInterface;
use FireflyIII\Models\Account;
use FireflyIII\Repositories\Account\AccountRepositoryInterface as ARI;
@@ -83,8 +84,7 @@ class ReportController extends Controller
{
// throw an error if necessary.
if ($end < $start) {
return view('error')->with('message', 'End date cannot be before start date, silly!');
throw new FireflyException('End date cannot be before start date, silly!')
}
// lower threshold

3
app/Http/Controllers/TransactionController.php
View File

@@ -7,6 +7,7 @@ use Config;
use ExpandedForm;
use FireflyIII\Events\TransactionJournalStored;
use FireflyIII\Events\TransactionJournalUpdated;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
use FireflyIII\Http\Requests\JournalFormRequest;
use FireflyIII\Models\PiggyBank;
@@ -141,7 +142,7 @@ class TransactionController extends Controller
{
// cannot edit opening balance
if ($journal->isOpeningBalance()) {
return view('error')->with('message', 'Cannot edit this transaction. Edit the account instead!');
throw new FireflyException('Cannot edit this transaction (#' . $journal->id . '). Edit the account instead!');
}