From dd9ddf86a8768dc8b4bd6bfcec47054edf944086 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Tue, 2 Apr 2024 21:40:47 +0000 Subject: [PATCH] template fixes + bug fixes + style fixes --- Controller/BackendController.php | 6 +++--- Controller/SearchController.php | 2 +- tests/Admin/AdminTest.php | 2 -- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Controller/BackendController.php b/Controller/BackendController.php index cecbade..2646d0b 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -180,12 +180,12 @@ final class BackendController extends Controller $id = $request->getDataString('id') ?? ''; /** @var \Model\Setting[] $settings */ - $settings = SettingMapper::getAll()->where('module', $id)->execute(); + $settings = SettingMapper::getAll()->where('module', $id)->executeGetArray(); if (!empty($settings)) { $view->data['settings'] = \is_array($settings) ? $settings : [$settings]; } - $navigation = NavElementMapper::getAll()->execute(); + $navigation = NavElementMapper::getAll()->executeGetArray(); $view->data['navigation'] = $navigation; $view->setTemplate('/Modules/' . static::NAME . '/Admin/Settings/Theme/Backend/settings'); @@ -245,7 +245,7 @@ final class BackendController extends Controller $activeNavElements = $query->execute(); $view->data['navs'] = $activeNavElements; - $apps = AppMapper::getAll()->execute(); + $apps = AppMapper::getAll()->executeGetArray(); $view->data['apps'] = $apps; return $view; diff --git a/Controller/SearchController.php b/Controller/SearchController.php index e99d7de..d787417 100755 --- a/Controller/SearchController.php +++ b/Controller/SearchController.php @@ -51,7 +51,7 @@ final class SearchController extends Controller $this->loadLanguage($request, $response, $request->getDataString('app') ?? $this->app->appName); /** @var \Modules\Navigation\Models\NavElement[] $elements */ - $elements = NavElementMapper::getAll()->execute(); + $elements = NavElementMapper::getAll()->executeGetArray(); $searchIdStartPos = \stripos($request->getDataString('search') ?? '', ':'); $patternStartPos = $searchIdStartPos === false ? -1 : \stripos( diff --git a/tests/Admin/AdminTest.php b/tests/Admin/AdminTest.php index 71da697..e961b91 100755 --- a/tests/Admin/AdminTest.php +++ b/tests/Admin/AdminTest.php @@ -33,8 +33,6 @@ final class AdminTest extends \PHPUnit\Framework\TestCase /** * Test if navigation model works correct - * - * */ #[\PHPUnit\Framework\Attributes\Group('final')] #[\PHPUnit\Framework\Attributes\Group('module')]