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

Fix #1353

Browse Source
This commit is contained in:
James Cole
2018-04-28 05:42:47 +02:00
parent b66daad3d3
commit 6f0e1c79ac
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/Http/Middleware/Range.php
View File

@@ -122,9 +122,13 @@ class Range
// ignore preference. set the range to be the current month: // ignore preference. set the range to be the current month:
if (!Session::has('start') && !Session::has('end')) { if (!Session::has('start') && !Session::has('end')) {
$viewRange = Preferences::get('viewRange', '1M')->data; $viewRange = Preferences::get('viewRange', '1M')->data;
$start = new Carbon; if (null === $viewRange) {
$start = app('navigation')->updateStartDate($viewRange, $start); $viewRange = '1M';
$end = app('navigation')->updateEndDate($viewRange, $start); Preferences::set('viewRange', '1M');
}
$start = new Carbon;
$start = app('navigation')->updateStartDate($viewRange, $start);
$end = app('navigation')->updateEndDate($viewRange, $start);
Session::put('start', $start); Session::put('start', $start);
Session::put('end', $end); Session::put('end', $end);
@@ -132,10 +136,10 @@ class Range
if (!Session::has('first')) { if (!Session::has('first')) {
/** @var JournalRepositoryInterface $repository */ /** @var JournalRepositoryInterface $repository */
$repository = app(JournalRepositoryInterface::class); $repository = app(JournalRepositoryInterface::class);
$journal = $repository->first(); $journal = $repository->firstNull();
$first = Carbon::now()->startOfYear(); $first = Carbon::now()->startOfYear();
if (null !== $journal->id) { if (null !== $journal) {
$first = $journal->date; $first = $journal->date;
} }
Session::put('first', $first); Session::put('first', $first);