From c04f3fc5beffe66f6d1a409a2dc734824bba459f Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sat, 30 Jan 2016 22:13:15 +0100 Subject: [PATCH] Cleanup and function pull out --- Controller.php | 33 ++++++--------------------------- 1 file changed, 6 insertions(+), 27 deletions(-) diff --git a/Controller.php b/Controller.php index 80fbd00..310438a 100644 --- a/Controller.php +++ b/Controller.php @@ -121,7 +121,7 @@ class Controller extends ModuleAbstract implements WebInterface { $view = new View($this->app, $request, $response); $view->setTemplate('/Modules/Purchase/Theme/Backend/invoice-list'); - $view->addData('nav', $this->createNavigation(1003001001, $request, $response)); + $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response)); return $view; } @@ -140,7 +140,7 @@ class Controller extends ModuleAbstract implements WebInterface { $view = new View($this->app, $request, $response); $view->setTemplate('/Modules/Purchase/Theme/Backend/invoice-create'); - $view->addData('nav', $this->createNavigation(1003001001, $request, $response)); + $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response)); return $view; } @@ -159,7 +159,7 @@ class Controller extends ModuleAbstract implements WebInterface { $view = new View($this->app, $request, $response); $view->setTemplate('/Modules/Purchase/Theme/Backend/article-list'); - $view->addData('nav', $this->createNavigation(1003001001, $request, $response)); + $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response)); return $view; } @@ -178,7 +178,7 @@ class Controller extends ModuleAbstract implements WebInterface { $view = new View($this->app, $request, $response); $view->setTemplate('/Modules/Purchase/Theme/Backend/article-create'); - $view->addData('nav', $this->createNavigation(1003001001, $request, $response)); + $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response)); return $view; } @@ -197,7 +197,7 @@ class Controller extends ModuleAbstract implements WebInterface { $view = new View($this->app, $request, $response); $view->setTemplate('/Modules/Purchase/Theme/Backend/article-profile'); - $view->addData('nav', $this->createNavigation(1003001001, $request, $response)); + $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response)); return $view; } @@ -216,30 +216,9 @@ class Controller extends ModuleAbstract implements WebInterface { $view = new View($this->app, $request, $response); $view->setTemplate('/Modules/Purchase/Theme/Backend/article-order-recommendation'); - $view->addData('nav', $this->createNavigation(1003001001, $request, $response)); + $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response)); return $view; } - /** - * @param int $pageId Page/parent Id for navigation - * @param RequestAbstract $request Request - * @param ResponseAbstract $response Response - * - * @return RenderableInterface - * - * @since 1.0.0 - * @author Dennis Eichhorn - */ - private function createNavigation(int $pageId, RequestAbstract $request, ResponseAbstract $response) - { - $nav = Navigation::getInstance($request, $this->app->dbPool); - $navView = new NavigationView($this->app, $request, $response); - $navView->setTemplate('/Modules/Navigation/Theme/Backend/mid'); - $navView->setNav($nav->getNav()); - $navView->setLanguage($request->getL11n()->getLanguage()); - $navView->setParent($pageId); - - return $navView; - } }