kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-13 16:00:13 +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

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

@@ -13,7 +13,7 @@ use Redirect;
use Response; use Response;
use Session; use Session;
use View; use View;
use URL;
/** /**
* Class BudgetController * Class BudgetController
* *
@@ -49,6 +49,12 @@ class BudgetController extends Controller
*/ */
public function create() public function create()
{ {
// put previous url in session if not redirect from store (not "create another").
if (Session::get('budgets.create.fromStore') !== true) {
Session::put('budgets.create.url', URL::previous());
}
Session::forget('budgets.create.fromStore');
return view('budgets.create')->with('subTitle', 'Create a new budget'); return view('budgets.create')->with('subTitle', 'Create a new budget');
} }
@@ -61,6 +67,9 @@ class BudgetController extends Controller
{ {
$subTitle = 'Delete budget' . e($budget->name) . '"'; $subTitle = 'Delete budget' . e($budget->name) . '"';
// put previous url in session
Session::put('budgets.delete.url', URL::previous());
return view('budgets.delete', compact('budget', 'subTitle')); return view('budgets.delete', compact('budget', 'subTitle'));
} }
@@ -75,9 +84,11 @@ class BudgetController extends Controller
$name = $budget->name; $name = $budget->name;
$repository->destroy($budget); $repository->destroy($budget);
Session::flash('success', 'The budget "' . e($name) . '" was deleted.'); Session::flash('success', 'The budget "' . e($name) . '" was deleted.');
return Redirect::route('budgets.index'); return Redirect::to(Session::get('budgets.delete.url'));
} }
/** /**
@@ -89,6 +100,12 @@ class BudgetController extends Controller
{ {
$subTitle = 'Edit budget "' . e($budget->name) . '"'; $subTitle = 'Edit budget "' . e($budget->name) . '"';
// put previous url in session if not redirect from store (not "return_to_edit").
if (Session::get('budgets.edit.fromUpdate') !== true) {
Session::put('budgets.edit.url', URL::previous());
}
Session::forget('budgets.edit.fromUpdate');
return view('budgets.edit', compact('budget', 'subTitle')); return view('budgets.edit', compact('budget', 'subTitle'));
} }
@@ -172,10 +189,13 @@ class BudgetController extends Controller
Session::flash('success', 'New budget "' . $budget->name . '" stored!'); Session::flash('success', 'New budget "' . $budget->name . '" stored!');
if (intval(Input::get('create_another')) === 1) { if (intval(Input::get('create_another')) === 1) {
// set value so create routine will not overwrite URL:
Session::put('budgets.create.fromStore', true);
return Redirect::route('budgets.create')->withInput(); return Redirect::route('budgets.create')->withInput();
} }
return Redirect::route('budgets.index'); // redirect to previous URL.
return Redirect::to(Session::get('budgets.create.url'));
} }
@@ -219,7 +239,9 @@ class BudgetController extends Controller
Session::flash('success', 'Budget "' . $budget->name . '" updated.'); Session::flash('success', 'Budget "' . $budget->name . '" updated.');
if (intval(Input::get('return_to_edit')) === 1) { if (intval(Input::get('return_to_edit')) === 1) {
return Redirect::route('budgets.edit', $budget->id); // set value so edit routine will not overwrite URL:
Session::put('budgets.edit.fromUpdate', true);
return Redirect::route('budgets.edit', $budget->id)->withInput(['return_to_edit' => 1]);
} }
return Redirect::route('budgets.index'); return Redirect::route('budgets.index');

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

@@ -163,10 +163,10 @@ class TransactionController extends Controller
$preFilled['account_to_id'] = $transactions[0]->account->id; $preFilled['account_to_id'] = $transactions[0]->account->id;
// put previous url in session if not redirect from store (not "return_to_edit"). // 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::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); 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) { if (intval(Input::get('return_to_edit')) === 1) {
// set value so edit routine will not overwrite URL: // 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. // redirect to previous URL.