From dd87b1472eb4f993ce646553089a51f6fc2f28e7 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 23 Sep 2019 17:13:42 +0200 Subject: [PATCH] Fix #2619 --- app/Http/Controllers/Category/NoCategoryController.php | 2 ++ resources/views/v1/list/groups.twig | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/app/Http/Controllers/Category/NoCategoryController.php b/app/Http/Controllers/Category/NoCategoryController.php index c63bd85d0c..5aea498cee 100644 --- a/app/Http/Controllers/Category/NoCategoryController.php +++ b/app/Http/Controllers/Category/NoCategoryController.php @@ -95,6 +95,7 @@ class NoCategoryController extends Controller $collector = app(GroupCollectorInterface::class); $collector->setRange($start, $end) ->setLimit($pageSize)->setPage($page)->withoutCategory() + ->withAccountInformation()->withBudgetInformation() ->setTypes([TransactionType::WITHDRAWAL, TransactionType::DEPOSIT, TransactionType::TRANSFER]); $groups = $collector->getPaginatedGroups(); $groups->setPath(route('categories.no-category')); @@ -129,6 +130,7 @@ class NoCategoryController extends Controller /** @var GroupCollectorInterface $collector */ $collector = app(GroupCollectorInterface::class); $collector->setRange($start, $end)->setLimit($pageSize)->setPage($page)->withoutCategory() + ->withAccountInformation()->withBudgetInformation() ->setTypes([TransactionType::WITHDRAWAL, TransactionType::DEPOSIT, TransactionType::TRANSFER]); $groups = $collector->getPaginatedGroups(); $groups->setPath(route('categories.no-category.all')); diff --git a/resources/views/v1/list/groups.twig b/resources/views/v1/list/groups.twig index f62fa77d89..80a0896ad9 100644 --- a/resources/views/v1/list/groups.twig +++ b/resources/views/v1/list/groups.twig @@ -213,5 +213,12 @@ TODO: hide and show columns + + {% if showCategory or showBudget %} + {{ groups.render|raw }} + {% else %} + {{ groups.render|raw }} + {% endif %} +