kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-02 12:15:55 +00:00
Code Issues Projects Releases Wiki Activity

This fixes #549

Browse Source
This commit is contained in:
James Cole
2017-02-05 08:26:54 +01:00
parent b68d5c4374
commit 3e510bd3f6
15 changed files with 118 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
app/Http/Controllers/PiggyBankController.php
View File

@@ -27,7 +27,6 @@ use Preferences;
use Response;
use Session;
use Steam;
use URL;
use View;
/**
@@ -116,7 +115,7 @@ class PiggyBankController extends Controller
// put previous url in session if not redirect from store (not "create another").
if (session('piggy-banks.create.fromStore') !== true) {
Session::put('piggy-banks.create.url', URL::previous());
$this->rememberPreviousUri('piggy-banks.create.uri');
}
Session::forget('piggy-banks.create.fromStore');
Session::flash('gaEventCategory', 'piggy-banks');
@@ -135,7 +134,7 @@ class PiggyBankController extends Controller
$subTitle = trans('firefly.delete_piggy_bank', ['name' => $piggyBank->name]);
// put previous url in session
Session::put('piggy-banks.delete.url', URL::previous());
$this->rememberPreviousUri('piggy-banks.delete.uri');
Session::flash('gaEventCategory', 'piggy-banks');
Session::flash('gaEventAction', 'delete');
@@ -152,16 +151,9 @@ class PiggyBankController extends Controller
{
Session::flash('success', strval(trans('firefly.deleted_piggy_bank', ['name' => e($piggyBank->name)])));
Preferences::mark();
$piggyBankId = $piggyBank->id;
$repository->destroy($piggyBank);
$uri = session('piggy-banks.delete.url');
if (!(strpos($uri, sprintf('piggy-banks/show/%s', $piggyBankId)) === false)) {
// uri would point back to piggy bank
$uri = route('piggy-banks.index');
}
return redirect($uri);
return redirect($this->getPreviousUri('piggy-banks.delete.uri'));
}
/**
@@ -197,7 +189,7 @@ class PiggyBankController extends Controller
// put previous url in session if not redirect from store (not "return_to_edit").
if (session('piggy-banks.edit.fromUpdate') !== true) {
Session::put('piggy-banks.edit.url', URL::previous());
$this->rememberPreviousUri('piggy-banks.edit.uri');
}
Session::forget('piggy-banks.edit.fromUpdate');
@@ -404,9 +396,7 @@ class PiggyBankController extends Controller
return redirect(route('piggy-banks.create'))->withInput();
}
// redirect to previous URL.
return redirect(session('piggy-banks.create.url'));
return redirect($this->getPreviousUri('piggy-banks.edit.uri'));
}
/**
@@ -430,12 +420,6 @@ class PiggyBankController extends Controller
return redirect(route('piggy-banks.edit', [$piggyBank->id]));
}
// redirect to previous URL.
return redirect(session('piggy-banks.edit.url'));
return redirect($this->getPreviousUri('piggy-banks.edit.uri'));
}
}