Jingga/oms-Navigation
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Navigation.git synced 2026-01-11 16:18:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

template fixes + bug fixes + style fixes

Browse Source
This commit is contained in:
Dennis Eichhorn 2024-04-02 21:40:47 +00:00
parent 580ea436fe
commit dd9ddf86a8
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Controller/BackendController.php
View File

@ -180,12 +180,12 @@ final class BackendController extends Controller
$id = $request->getDataString('id') ?? ''; $id = $request->getDataString('id') ?? '';
/** @var \Model\Setting[] $settings */ /** @var \Model\Setting[] $settings */
$settings = SettingMapper::getAll()->where('module', $id)->execute(); $settings = SettingMapper::getAll()->where('module', $id)->executeGetArray();
if (!empty($settings)) { if (!empty($settings)) {
$view->data['settings'] = \is_array($settings) ? $settings : [$settings]; $view->data['settings'] = \is_array($settings) ? $settings : [$settings];
} }
$navigation = NavElementMapper::getAll()->execute(); $navigation = NavElementMapper::getAll()->executeGetArray();
$view->data['navigation'] = $navigation; $view->data['navigation'] = $navigation;
$view->setTemplate('/Modules/' . static::NAME . '/Admin/Settings/Theme/Backend/settings'); $view->setTemplate('/Modules/' . static::NAME . '/Admin/Settings/Theme/Backend/settings');
@ -245,7 +245,7 @@ final class BackendController extends Controller
$activeNavElements = $query->execute(); $activeNavElements = $query->execute();
$view->data['navs'] = $activeNavElements; $view->data['navs'] = $activeNavElements;
$apps = AppMapper::getAll()->execute(); $apps = AppMapper::getAll()->executeGetArray();
$view->data['apps'] = $apps; $view->data['apps'] = $apps;
return $view; return $view;

2
Controller/SearchController.php
View File

@ -51,7 +51,7 @@ final class SearchController extends Controller
$this->loadLanguage($request, $response, $request->getDataString('app') ?? $this->app->appName); $this->loadLanguage($request, $response, $request->getDataString('app') ?? $this->app->appName);
/** @var \Modules\Navigation\Models\NavElement[] $elements */ /** @var \Modules\Navigation\Models\NavElement[] $elements */
$elements = NavElementMapper::getAll()->execute(); $elements = NavElementMapper::getAll()->executeGetArray();
$searchIdStartPos = \stripos($request->getDataString('search') ?? '', ':'); $searchIdStartPos = \stripos($request->getDataString('search') ?? '', ':');
$patternStartPos = $searchIdStartPos === false ? -1 : \stripos( $patternStartPos = $searchIdStartPos === false ? -1 : \stripos(

2
tests/Admin/AdminTest.php
View File

@ -33,8 +33,6 @@ final class AdminTest extends \PHPUnit\Framework\TestCase
/** /**
* Test if navigation model works correct * Test if navigation model works correct
*
*
*/ */
#[\PHPUnit\Framework\Attributes\Group('final')] #[\PHPUnit\Framework\Attributes\Group('final')]
#[\PHPUnit\Framework\Attributes\Group('module')] #[\PHPUnit\Framework\Attributes\Group('module')]