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

These routines fix #477

Browse Source
This commit is contained in:
James Cole
2016-12-19 21:07:22 +01:00
parent fc0ad622eb
commit 116e19ec06
6 changed files with 61 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/Http/Controllers/Transaction/SingleController.php
View File

@@ -153,16 +153,21 @@ class SingleController extends Controller
if ($this->isOpeningBalance($transactionJournal)) {
return $this->redirectToAccount($transactionJournal);
}
$type = TransactionJournal::transactionTypeStr($transactionJournal);
$journalId = $transactionJournal->id;
$type = TransactionJournal::transactionTypeStr($transactionJournal);
Session::flash('success', strval(trans('firefly.deleted_' . strtolower($type), ['description' => e($transactionJournal->description)])));
$repository->delete($transactionJournal);
Preferences::mark();
// redirect to previous URL:
return redirect(session('transactions.delete.url'));
$uri = session('transactions.delete.url');
if (!(strpos($uri, sprintf('transactions/show/%s', $journalId)) === false)) {
// uri would point back to transaction
$uri = route('transactions.index', [strtolower($type)]);
}
return redirect($uri);
}
/**