From 483e7256f7f541f607d86f2a838a34d85a26a525 Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 27 Aug 2020 06:18:47 +0200 Subject: [PATCH] Disable layout caches. --- app/Http/Controllers/Account/IndexController.php | 13 ------------- app/Http/Controllers/Account/ShowController.php | 5 ----- 2 files changed, 18 deletions(-) diff --git a/app/Http/Controllers/Account/IndexController.php b/app/Http/Controllers/Account/IndexController.php index e9cdb74072..181f9fd607 100644 --- a/app/Http/Controllers/Account/IndexController.php +++ b/app/Http/Controllers/Account/IndexController.php @@ -116,14 +116,6 @@ class IndexController extends Controller } - /** - * @return \Illuminate\Contracts\Foundation\Application|Factory|View - */ - public function emptyIndex(?string $objectType = null) - { - return view('accounts.empty-index', compact('objectType')); - } - /** * Show list of accounts. * @@ -135,11 +127,6 @@ class IndexController extends Controller */ public function index(Request $request, string $objectType) { - // temp catch for layout. - if ('v2' === config('firefly.layout')) { - return $this->emptyIndex($objectType); - } - // reset account order: $objectType = $objectType ?? 'asset'; diff --git a/app/Http/Controllers/Account/ShowController.php b/app/Http/Controllers/Account/ShowController.php index bb9bc474b9..58cc741bf7 100644 --- a/app/Http/Controllers/Account/ShowController.php +++ b/app/Http/Controllers/Account/ShowController.php @@ -92,11 +92,6 @@ class ShowController extends Controller { $objectType = config(sprintf('firefly.shortNamesByFullName.%s', $account->accountType->type)); - // temp catch for layout. - if ('v2' === config('firefly.layout')) { - return view('accounts.empty-index', compact('objectType')); - } - if (!$this->isEditableAccount($account)) { return $this->redirectAccountToAccount($account); // @codeCoverageIgnore }