From 95c3f52144ebe66fe44a6dc57de2e736750feaa9 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 16 Oct 2017 15:53:55 +0200 Subject: [PATCH] Fix #932 --- app/Http/Controllers/HomeController.php | 8 +------- resources/views/partials/boxes.twig | 17 ++++------------- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 66fe45ce1e..eb48b4a263 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -19,7 +19,6 @@ use FireflyIII\Exceptions\FireflyException; use FireflyIII\Helpers\Collector\JournalCollectorInterface; use FireflyIII\Models\AccountType; use FireflyIII\Repositories\Account\AccountRepositoryInterface; -use FireflyIII\Repositories\Bill\BillRepositoryInterface; use Illuminate\Http\Request; use Illuminate\Routing\Route; use Illuminate\Support\Collection; @@ -133,11 +132,6 @@ class HomeController extends Controller $accounts = $repository->getAccountsById($frontPage->data); $showDeps = Preferences::get('showDepositsFrontpage', false)->data; - // zero bills? Hide some elements from view. - /** @var BillRepositoryInterface $billRepository */ - $billRepository = app(BillRepositoryInterface::class); - $billCount = $billRepository->getBills()->count(); - foreach ($accounts as $account) { $collector = app(JournalCollectorInterface::class); $collector->setAccounts(new Collection([$account]))->setRange($start, $end)->setLimit(10)->setPage(1); @@ -146,7 +140,7 @@ class HomeController extends Controller } return view( - 'index', compact('count', 'subTitle', 'transactions', 'showDeps', 'billCount') + 'index', compact('count', 'subTitle', 'transactions', 'showDeps') ); } diff --git a/resources/views/partials/boxes.twig b/resources/views/partials/boxes.twig index 2fc8f07e68..6964de40f3 100644 --- a/resources/views/partials/boxes.twig +++ b/resources/views/partials/boxes.twig @@ -1,16 +1,7 @@ -{# Set box sizes: #} -{% if billCount > 0 %} - {% set boxClasses = 'col-lg-3 col-md-3 col-sm-6 col-xs-12' %} -{% else %} - {# Zero bills? Remove the boxes. #} - {% set boxClasses = 'col-lg-4 col-md-4 col-sm-6 col-xs-12' %} -{% endif %} - -