IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed more redirections.

Browse Source
This commit is contained in:
James Cole 2015-04-01 09:43:19 +02:00
parent 7578ec6801
commit 83f32478fa
2 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -244,7 +244,8 @@ class BudgetController extends Controller
return Redirect::route('budgets.edit', $budget->id)->withInput(['return_to_edit' => 1]); return Redirect::route('budgets.edit', $budget->id)->withInput(['return_to_edit' => 1]);
} }
return Redirect::route('budgets.index'); // redirect to previous URL.
return Redirect::to(Session::get('budgets.edit.url'));
} }

27
app/Http/Controllers/CategoryController.php
View File

@ -11,7 +11,7 @@ use Input;
use Redirect; use Redirect;
use Session; use Session;
use View; use View;
use URL;
/** /**
* Class CategoryController * Class CategoryController
@ -35,6 +35,12 @@ class CategoryController extends Controller
*/ */
public function create() public function create()
{ {
// put previous url in session if not redirect from store (not "create another").
if (Session::get('categories.create.fromStore') !== true) {
Session::put('categories.create.url', URL::previous());
}
Session::forget('categories.create.fromStore');
return view('categories.create')->with('subTitle', 'Create a new category'); return view('categories.create')->with('subTitle', 'Create a new category');
} }
@ -47,6 +53,9 @@ class CategoryController extends Controller
{ {
$subTitle = 'Delete category' . e($category->name) . '"'; $subTitle = 'Delete category' . e($category->name) . '"';
// put previous url in session
Session::put('categories.delete.url', URL::previous());
return view('categories.delete', compact('category', 'subTitle')); return view('categories.delete', compact('category', 'subTitle'));
} }
@ -63,7 +72,7 @@ class CategoryController extends Controller
Session::flash('success', 'The category "' . e($name) . '" was deleted.'); Session::flash('success', 'The category "' . e($name) . '" was deleted.');
return Redirect::route('categories.index'); return Redirect::to(Session::get('categories.delete.url'));
} }
/** /**
@ -75,6 +84,12 @@ class CategoryController extends Controller
{ {
$subTitle = 'Edit category "' . e($category->name) . '"'; $subTitle = 'Edit category "' . e($category->name) . '"';
// put previous url in session if not redirect from store (not "return_to_edit").
if (Session::get('categories.edit.fromUpdate') !== true) {
Session::put('categories.edit.url', URL::previous());
}
Session::forget('categories.edit.fromUpdate');
return view('categories.edit', compact('category', 'subTitle')); return view('categories.edit', compact('category', 'subTitle'));
} }
@ -166,10 +181,12 @@ class CategoryController extends Controller
Session::flash('success', 'New category "' . $category->name . '" stored!'); Session::flash('success', 'New category "' . $category->name . '" stored!');
if (intval(Input::get('create_another')) === 1) { if (intval(Input::get('create_another')) === 1) {
Session::put('categories.create.fromStore', true);
return Redirect::route('categories.create')->withInput(); return Redirect::route('categories.create')->withInput();
} }
return Redirect::route('categories.index'); // redirect to previous URL.
return Redirect::to(Session::get('categories.create.url'));
} }
@ -192,10 +209,12 @@ class CategoryController extends Controller
Session::flash('success', 'Category "' . $category->name . '" updated.'); Session::flash('success', 'Category "' . $category->name . '" updated.');
if (intval(Input::get('return_to_edit')) === 1) { if (intval(Input::get('return_to_edit')) === 1) {
Session::put('categories.edit.fromUpdate', true);
return Redirect::route('categories.edit', $category->id); return Redirect::route('categories.edit', $category->id);
} }
return Redirect::route('categories.index'); // redirect to previous URL.
return Redirect::to(Session::get('categories.edit.url'));
} }