From 35c8b2fce84f2ff39edbea7faa894523453195e6 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 21 Dec 2018 10:17:38 +0100 Subject: [PATCH] Fix #1901 --- app/Http/Controllers/Transaction/SingleController.php | 4 ++++ app/Support/Http/Controllers/UserNavigation.php | 7 ++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Transaction/SingleController.php b/app/Http/Controllers/Transaction/SingleController.php index 8a6c131c5e..8dd1d44ea1 100644 --- a/app/Http/Controllers/Transaction/SingleController.php +++ b/app/Http/Controllers/Transaction/SingleController.php @@ -105,6 +105,10 @@ class SingleController extends Controller $amount = app('steam')->positive($transaction->amount); $foreignAmount = null === $transaction->foreign_amount ? null : app('steam')->positive($transaction->foreign_amount); + // make sure previous URI is correct: + session()->put('transactions.create.fromStore', true); + session()->put('transactions.create.uri', app('url')->previous()); + $preFilled = [ 'description' => $journal->description, 'source_id' => $source->id, diff --git a/app/Support/Http/Controllers/UserNavigation.php b/app/Support/Http/Controllers/UserNavigation.php index 3119328c52..dbf0274c07 100644 --- a/app/Support/Http/Controllers/UserNavigation.php +++ b/app/Support/Http/Controllers/UserNavigation.php @@ -30,7 +30,6 @@ use FireflyIII\Models\TransactionJournal; use Illuminate\Http\RedirectResponse; use Illuminate\Support\ViewErrorBag; use Log; -use URL; /** * Trait UserNavigation @@ -144,8 +143,10 @@ trait UserNavigation { /** @var ViewErrorBag $errors */ $errors = session()->get('errors'); - if(null === $errors || (null !== $errors && 0=== $errors->count())) { - session()->put($identifier, URL::previous()); + if (null === $errors || (null !== $errors && 0 === $errors->count())) { + $url = app('url')->previous(); + session()->put($identifier, $url); + Log::debug(sprintf('Will put previous URI in cache under key %s: %s', $identifier, $url)); } } } \ No newline at end of file