From 043bf02b85d55c5690b3b2fc74f22c61d4d69687 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 | 41 ++++++++++------------------------------- 1 file changed, 10 insertions(+), 31 deletions(-) diff --git a/Controller.php b/Controller.php index bf0b878..5eddb12 100644 --- a/Controller.php +++ b/Controller.php @@ -124,7 +124,7 @@ class Controller extends ModuleAbstract implements WebInterface { $view = new View($this->app, $request, $response); $view->setTemplate('/Modules/RiskManagement/Theme/Backend/cockpit'); - $view->addData('nav', $this->createNavigation(1003001001, $request, $response)); + $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response)); return $view; } @@ -143,7 +143,7 @@ class Controller extends ModuleAbstract implements WebInterface { $view = new View($this->app, $request, $response); $view->setTemplate('/Modules/RiskManagement/Theme/Backend/risk-list'); - $view->addData('nav', $this->createNavigation(1003001001, $request, $response)); + $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response)); return $view; } @@ -162,7 +162,7 @@ class Controller extends ModuleAbstract implements WebInterface { $view = new View($this->app, $request, $response); $view->setTemplate('/Modules/RiskManagement/Theme/Backend/cause-list'); - $view->addData('nav', $this->createNavigation(1003001001, $request, $response)); + $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response)); return $view; } @@ -181,7 +181,7 @@ class Controller extends ModuleAbstract implements WebInterface { $view = new View($this->app, $request, $response); $view->setTemplate('/Modules/RiskManagement/Theme/Backend/solution-list'); - $view->addData('nav', $this->createNavigation(1003001001, $request, $response)); + $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response)); return $view; } @@ -200,7 +200,7 @@ class Controller extends ModuleAbstract implements WebInterface { $view = new View($this->app, $request, $response); $view->setTemplate('/Modules/RiskManagement/Theme/Backend/unit-list'); - $view->addData('nav', $this->createNavigation(1003001001, $request, $response)); + $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response)); return $view; } @@ -219,7 +219,7 @@ class Controller extends ModuleAbstract implements WebInterface { $view = new View($this->app, $request, $response); $view->setTemplate('/Modules/RiskManagement/Theme/Backend/department-list'); - $view->addData('nav', $this->createNavigation(1003001001, $request, $response)); + $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response)); return $view; } @@ -238,7 +238,7 @@ class Controller extends ModuleAbstract implements WebInterface { $view = new View($this->app, $request, $response); $view->setTemplate('/Modules/RiskManagement/Theme/Backend/category-list'); - $view->addData('nav', $this->createNavigation(1003001001, $request, $response)); + $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response)); return $view; } @@ -257,7 +257,7 @@ class Controller extends ModuleAbstract implements WebInterface { $view = new View($this->app, $request, $response); $view->setTemplate('/Modules/RiskManagement/Theme/Backend/project-list'); - $view->addData('nav', $this->createNavigation(1003001001, $request, $response)); + $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response)); return $view; } @@ -276,7 +276,7 @@ class Controller extends ModuleAbstract implements WebInterface { $view = new View($this->app, $request, $response); $view->setTemplate('/Modules/RiskManagement/Theme/Backend/process-list'); - $view->addData('nav', $this->createNavigation(1003001001, $request, $response)); + $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response)); return $view; } @@ -295,30 +295,9 @@ class Controller extends ModuleAbstract implements WebInterface { $view = new View($this->app, $request, $response); $view->setTemplate('/Modules/RiskManagement/Theme/Backend/settings-dashboard'); - $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; - } }