diff --git a/Admin/Settings/Theme/Backend/modules-nav-list.tpl.php b/Admin/Settings/Theme/Backend/modules-nav-list.tpl.php index 65ec478..ba55321 100755 --- a/Admin/Settings/Theme/Backend/modules-nav-list.tpl.php +++ b/Admin/Settings/Theme/Backend/modules-nav-list.tpl.php @@ -15,10 +15,10 @@ declare(strict_types=1); /** * @var \phpOMS\Views\View $this */ -$navs = $this->getData('navs') ?? []; -$apps = $this->getData('apps') ?? []; +$navs = $this->data['navs'] ?? []; +$apps = $this->data['apps'] ?? []; -echo $this->getData('nav')->render(); +echo $this->data['nav']->render(); ?>
diff --git a/Admin/Settings/Theme/Backend/settings-nav.tpl.php b/Admin/Settings/Theme/Backend/settings-nav.tpl.php index 598d021..81262a1 100755 --- a/Admin/Settings/Theme/Backend/settings-nav.tpl.php +++ b/Admin/Settings/Theme/Backend/settings-nav.tpl.php @@ -15,12 +15,12 @@ declare(strict_types=1); use phpOMS\Uri\UriFactory; $nav = $this->getData('nav-element'); -$routes = $this->getData('routes') ?? []; +$routes = $this->data['routes'] ?? []; /** * @var \phpOMS\Views\View $this */ -echo $this->getData('nav')->render(); ?> +echo $this->data['nav']->render(); ?>
diff --git a/Admin/Settings/Theme/Backend/settings.tpl.php b/Admin/Settings/Theme/Backend/settings.tpl.php index 99e57fd..83d85af 100755 --- a/Admin/Settings/Theme/Backend/settings.tpl.php +++ b/Admin/Settings/Theme/Backend/settings.tpl.php @@ -18,12 +18,12 @@ use phpOMS\Uri\UriFactory; * @var \phpOMS\Views\View $this * @var \Modules\Navigation\Models\NavElement[] $navs */ -$navs = $this->getData('navigation') ?? []; +$navs = $this->data['navigation'] ?? []; $previous = empty($navs) ? 'admin/nav/list' : '{/base}/admin/nav/list?{?}&id=' . \reset($navs)->id . '&ptype=p'; $next = empty($navs) ? 'admin/nav/list' : '{/base}/admin/nav/list?{?}&id=' . \end($navs)->id . '&ptype=n'; -echo $this->getData('nav')->render(); ?> +echo $this->data['nav']->render(); ?>
diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 0a7c7a3..6037425 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -175,17 +175,17 @@ final class BackendController extends Controller public function viewModuleSettings(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : RenderableInterface { $view = new View($this->app->l11nManager, $request, $response); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response); $id = $request->getDataString('id') ?? ''; $settings = SettingMapper::getAll()->where('module', $id)->execute(); if ($settings->id > 0) { - $view->setData('settings', !\is_array($settings) ? [$settings] : $settings); + $view->data['settings'] = !\is_array($settings) ? [$settings] : $settings; } $navigation = NavElementMapper::getAll()->execute(); - $view->setData('navigation', $navigation); + $view->data['navigation'] = $navigation; $view->setTemplate('/Modules/' . static::NAME . '/Admin/Settings/Theme/Backend/settings'); @@ -207,9 +207,9 @@ final class BackendController extends Controller { $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->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response); - $view->addData('nav-element', NavElementMapper::get()->where('id', (int) $request->getData('nav'))->execute()); + $view->data['nav-element'] = NavElementMapper::get()->where('id', (int) $request->getData('nav'))->execute(); return $view; } @@ -229,10 +229,10 @@ final class BackendController extends Controller { $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/Navigation/Admin/Settings/Theme/Backend/modules-nav-list'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response); $module = $request->getDataString('id') ?? ''; - $view->setData('module', $module); + $view->data['module'] = $module; $query = NavElementMapper::getAll() ->where('from', $module); @@ -242,10 +242,10 @@ final class BackendController extends Controller } $activeNavElements = $query->execute(); - $view->setData('navs', $activeNavElements); + $view->data['navs'] = $activeNavElements; $apps = AppMapper::getAll()->execute(); - $view->setData('apps', $apps); + $view->data['apps'] = $apps; return $view; } diff --git a/Theme/Backend/top.tpl.php b/Theme/Backend/top.tpl.php index 99ecb9c..01b2e28 100755 --- a/Theme/Backend/top.tpl.php +++ b/Theme/Backend/top.tpl.php @@ -19,7 +19,7 @@ use Modules\Navigation\Models\NavigationType; */ if (isset($this->nav[NavigationType::TOP])) : ?>