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

Clean up session code

Browse Source
This commit is contained in:
James Cole
2017-02-17 20:14:22 +01:00
parent 5d0cdc4ffa
commit 65a899bf25
11 changed files with 155 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,7 +25,6 @@ use Illuminate\Http\Request;
use Illuminate\Support\Collection;
use Navigation;
use Preferences;
use Session;
use View;
/**
@@ -55,63 +54,68 @@ class CategoryController extends Controller
}
/**
* @param Request $request
*
* @return View
*/
public function create()
public function create(Request $request)
{
if (session('categories.create.fromStore') !== true) {
$this->rememberPreviousUri('categories.create.uri');
}
Session::forget('categories.create.fromStore');
Session::flash('gaEventCategory', 'categories');
Session::flash('gaEventAction', 'create');
$request->session()->forget('categories.create.fromStore');
$request->session()->flash('gaEventCategory', 'categories');
$request->session()->flash('gaEventAction', 'create');
$subTitle = trans('firefly.create_new_category');
return view('categories.create', compact('subTitle'));
}
/**
* @param Request $request
* @param Category $category
*
* @return View
*/
public function delete(Category $category)
public function delete(Request $request, Category $category)
{
$subTitle = trans('firefly.delete_category', ['name' => $category->name]);
// put previous url in session
$this->rememberPreviousUri('categories.delete.uri');
Session::flash('gaEventCategory', 'categories');
Session::flash('gaEventAction', 'delete');
$request->session()->flash('gaEventCategory', 'categories');
$request->session()->flash('gaEventAction', 'delete');
return view('categories.delete', compact('category', 'subTitle'));
}
/**
* @param Request $request
* @param CategoryRepositoryInterface $repository
* @param Category $category
*
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
public function destroy(CategoryRepositoryInterface $repository, Category $category)
public function destroy(Request $request, CategoryRepositoryInterface $repository, Category $category)
{
$name = $category->name;
$repository->destroy($category);
Session::flash('success', strval(trans('firefly.deleted_category', ['name' => e($name)])));
$request->session()->flash('success', strval(trans('firefly.deleted_category', ['name' => e($name)])));
Preferences::mark();
return redirect($this->getPreviousUri('categories.delete.uri'));
}
/**
* @param Request $request
* @param Category $category
*
* @return View
*/
public function edit(Category $category)
public function edit(Request $request, Category $category)
{
$subTitle = trans('firefly.edit_category', ['name' => $category->name]);
@@ -119,9 +123,9 @@ class CategoryController extends Controller
if (session('categories.edit.fromUpdate') !== true) {
$this->rememberPreviousUri('categories.edit.uri');
}
Session::forget('categories.edit.fromUpdate');
Session::flash('gaEventCategory', 'categories');
Session::flash('gaEventAction', 'edit');
$request->session()->forget('categories.edit.fromUpdate');
$request->session()->flash('gaEventCategory', 'categories');
$request->session()->flash('gaEventAction', 'edit');
return view('categories.edit', compact('category', 'subTitle'));
@@ -269,11 +273,11 @@ class CategoryController extends Controller
$data = $request->getCategoryData();
$category = $repository->store($data);
Session::flash('success', strval(trans('firefly.stored_category', ['name' => e($category->name)])));
$request->session()->flash('success', strval(trans('firefly.stored_category', ['name' => e($category->name)])));
Preferences::mark();
if (intval($request->get('create_another')) === 1) {
Session::put('categories.create.fromStore', true);
$request->session()->put('categories.create.fromStore', true);
return redirect(route('categories.create'))->withInput();
}
@@ -294,11 +298,11 @@ class CategoryController extends Controller
$data = $request->getCategoryData();
$repository->update($category, $data);
Session::flash('success', strval(trans('firefly.updated_category', ['name' => e($category->name)])));
$request->session()->flash('success', strval(trans('firefly.updated_category', ['name' => e($category->name)])));
Preferences::mark();
if (intval($request->get('return_to_edit')) === 1) {
Session::put('categories.edit.fromUpdate', true);
$request->session()->put('categories.edit.fromUpdate', true);
return redirect(route('categories.edit', [$category->id]));
}