diff --git a/Admin/Settings/Theme/Backend/settings-nav.tpl.php b/Admin/Settings/Theme/Backend/settings-nav.tpl.php index 719036c..4196194 100644 --- a/Admin/Settings/Theme/Backend/settings-nav.tpl.php +++ b/Admin/Settings/Theme/Backend/settings-nav.tpl.php @@ -14,8 +14,8 @@ declare(strict_types=1); use phpOMS\Uri\UriFactory; -$nav = $this->getData('nav'); -$routes = $this->getData('routes'); +$nav = $this->getData('nav-element'); +$routes = $this->getData('routes') ?? []; /** * @var \phpOMS\Views\View $this @@ -29,12 +29,12 @@ echo $this->getData('nav')->render(); ?>
- +
- +
@@ -49,17 +49,17 @@ echo $this->getData('nav')->render(); ?>
- +
- +
- +
@@ -74,22 +74,22 @@ echo $this->getData('nav')->render(); ?>
- +
- +
- +
- +
@@ -198,8 +198,8 @@ echo $this->getData('nav')->render(); ?>
diff --git a/Controller/BackendController.php b/Controller/BackendController.php index cb75b17..39031fd 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -47,9 +47,10 @@ final class BackendController extends Controller * @since 1.0.0 * @codeCoverageIgnore */ - public function createNavigationMid(int $pageId, RequestAbstract $request, ResponseAbstract $response) : NavigationView + public function createNavigationMid(int $pageId, RequestAbstract $request, ResponseAbstract $response): NavigationView { - $nav = Navigation::getInstance($request, + $nav = Navigation::getInstance( + $request, $this->app->accountManager->get($request->header->account), $this->app->dbPool, $this->app->orgId, @@ -75,7 +76,7 @@ final class BackendController extends Controller * @since 1.0.0 * @codeCoverageIgnore */ - public function getView(RequestAbstract $request, ResponseAbstract $response) : NavigationView + public function getView(RequestAbstract $request, ResponseAbstract $response): NavigationView { $navObj = Navigation::getInstance( $request, @@ -109,7 +110,7 @@ final class BackendController extends Controller * @since 1.0.0 * @codeCoverageIgnore */ - public function loadLanguage(RequestAbstract $request, ResponseAbstract $response) : void + public function loadLanguage(RequestAbstract $request, ResponseAbstract $response): void { $languages = $this->app->moduleManager->getLanguageFiles($request); $langCode = $response->getLanguage(); @@ -138,9 +139,10 @@ final class BackendController extends Controller * @since 1.0.0 * @codeCoverageIgnore */ - public function createNavigationSplash(int $pageId, RequestAbstract $request, ResponseAbstract $response) : NavigationView + public function createNavigationSplash(int $pageId, RequestAbstract $request, ResponseAbstract $response): NavigationView { - $nav = Navigation::getInstance($request, + $nav = Navigation::getInstance( + $request, $this->app->accountManager->get($request->header->account), $this->app->dbPool, $this->app->orgId, @@ -167,7 +169,7 @@ final class BackendController extends Controller * * @since 1.0.0 */ - public function viewModuleSettings(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface + public function viewModuleSettings(RequestAbstract $request, ResponseAbstract $response, $data = null): RenderableInterface { $view = new View($this->app->l11nManager, $request, $response); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response)); @@ -202,12 +204,14 @@ final class BackendController extends Controller * * @since 1.0.0 */ - public function viewModuleNavElementSettings(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface + public function viewModuleNavElementSettings(RequestAbstract $request, ResponseAbstract $response, $data = null): RenderableInterface { $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/' . static::NAME . '/Admin/Settings/Theme/Backend/settings-nav'); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response)); $view->addData('nav-element', NavElementMapper::get((int) $request->getData('nav'))); + + return $view; } }