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

Fix redirections in budget.

Browse Source
This commit is contained in:
James Cole
2015-04-01 09:40:19 +02:00
parent e14a32f76f
commit 7578ec6801
2 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -163,10 +163,10 @@ class TransactionController extends Controller
$preFilled['account_to_id'] = $transactions[0]->account->id;
// put previous url in session if not redirect from store (not "return_to_edit").
if (Session::get('transactions.create.fromUpdate') !== true) {
if (Session::get('transactions.edit.fromUpdate') !== true) {
Session::put('transactions.edit.url', URL::previous());
}
Session::forget('transactions.create.fromUpdate');
Session::forget('transactions.edit.fromUpdate');
return View::make('transactions.edit', compact('journal', 'accounts', 'what', 'budgets', 'piggies', 'subTitle'))->with('data', $preFilled);
@@ -325,9 +325,9 @@ class TransactionController extends Controller
if (intval(Input::get('return_to_edit')) === 1) {
// set value so edit routine will not overwrite URL:
Session::put('transactions.create.fromUpdate', true);
Session::put('transactions.edit.fromUpdate', true);
return Redirect::route('transactions.edit', $journal->id)->withInput(['return_to_edit' => intval(Input::get('return_to_edit'))]);
return Redirect::route('transactions.edit', $journal->id)->withInput(['return_to_edit' => 1]);
}
// redirect to previous URL.