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

Fix #1901

Browse Source
This commit is contained in:
James Cole 2018-12-21 10:17:38 +01:00
parent 4f5d8f830e
commit 35c8b2fce8
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Transaction/SingleController.php
View File

@ -105,6 +105,10 @@ class SingleController extends Controller
$amount = app('steam')->positive($transaction->amount); $amount = app('steam')->positive($transaction->amount);
$foreignAmount = null === $transaction->foreign_amount ? null : app('steam')->positive($transaction->foreign_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 = [ $preFilled = [
'description' => $journal->description, 'description' => $journal->description,
'source_id' => $source->id, 'source_id' => $source->id,

7
app/Support/Http/Controllers/UserNavigation.php
View File

@ -30,7 +30,6 @@ use FireflyIII\Models\TransactionJournal;
use Illuminate\Http\RedirectResponse; use Illuminate\Http\RedirectResponse;
use Illuminate\Support\ViewErrorBag; use Illuminate\Support\ViewErrorBag;
use Log; use Log;
use URL;
/** /**
* Trait UserNavigation * Trait UserNavigation
@ -144,8 +143,10 @@ trait UserNavigation
{ {
/** @var ViewErrorBag $errors */ /** @var ViewErrorBag $errors */
$errors = session()->get('errors'); $errors = session()->get('errors');
if(null === $errors || (null !== $errors && 0=== $errors->count())) { if (null === $errors || (null !== $errors && 0 === $errors->count())) {
session()->put($identifier, URL::previous()); $url = app('url')->previous();
session()->put($identifier, $url);
Log::debug(sprintf('Will put previous URI in cache under key %s: %s', $identifier, $url));
} }
} }
} }