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

Fix #1046

Browse Source
This commit is contained in:
James Cole
2017-12-09 19:14:31 +01:00
parent f231edaa6d
commit 17684a3ab3
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -233,6 +233,7 @@ class CategoryController extends Controller
$start = null; $start = null;
$end = null; $end = null;
$periods = new Collection; $periods = new Collection;
$path = route('categories.show', [$category->id]);
// prep for "all" view. // prep for "all" view.
if ('all' === $moment) { if ('all' === $moment) {
@@ -241,6 +242,7 @@ class CategoryController extends Controller
/** @var Carbon $start */ /** @var Carbon $start */
$start = null === $first ? new Carbon : $first; $start = null === $first ? new Carbon : $first;
$end = new Carbon; $end = new Carbon;
$path = route('categories.show', [$category->id,'all']);
} }
// prep for "specific date" view. // prep for "specific date" view.
@@ -253,6 +255,7 @@ class CategoryController extends Controller
'start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat),] 'start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat),]
); );
$periods = $this->getPeriodOverview($category); $periods = $this->getPeriodOverview($category);
$path = route('categories.show', [$category->id, $moment]);
} }
// prep for current period // prep for current period
@@ -275,7 +278,7 @@ class CategoryController extends Controller
->setCategory($category)->withBudgetInformation()->withCategoryInformation(); ->setCategory($category)->withBudgetInformation()->withCategoryInformation();
$collector->removeFilter(InternalTransferFilter::class); $collector->removeFilter(InternalTransferFilter::class);
$transactions = $collector->getPaginatedJournals(); $transactions = $collector->getPaginatedJournals();
$transactions->setPath(route('categories.show', [$category->id])); $transactions->setPath($path);
return view('categories.show', compact('category', 'moment', 'transactions', 'periods', 'subTitle', 'subTitleIcon', 'start', 'end')); return view('categories.show', compact('category', 'moment', 'transactions', 'periods', 'subTitle', 'subTitleIcon', 'start', 'end'));
} }