From 3ba01efd43a0a29c7738f513337b1cdf4032b7a1 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sat, 9 Apr 2016 10:42:22 +0200 Subject: [PATCH] Fixing remaining bugs for route-restructure --- Admin/Installer.php | 1 + Admin/Routes/http.php | 2 ++ Controller.php | 8 ++++---- Theme/Backend/Lang/Navigation.en.lang.php | 4 ++-- Theme/Backend/Lang/en.lang.php | 4 ++-- Theme/backend/Lang/Navigation.en.lang.php | 4 ++-- Theme/backend/Lang/en.lang.php | 4 ++-- 7 files changed, 15 insertions(+), 12 deletions(-) diff --git a/Admin/Installer.php b/Admin/Installer.php index e951edc..f849266 100644 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -17,6 +17,7 @@ namespace Modules\Production\Admin; use phpOMS\DataStorage\Database\DatabaseType; use phpOMS\DataStorage\Database\Pool; +use phpOMS\Module\InfoManager; use phpOMS\Module\InstallerAbstract; /** diff --git a/Admin/Routes/http.php b/Admin/Routes/http.php index be7f3a6..dfc6f34 100644 --- a/Admin/Routes/http.php +++ b/Admin/Routes/http.php @@ -1,5 +1,7 @@ [ [ diff --git a/Controller.php b/Controller.php index 5e0f455..a1a0089 100644 --- a/Controller.php +++ b/Controller.php @@ -90,7 +90,7 @@ class Controller extends ModuleAbstract implements WebInterface * @since 1.0.0 * @author Dennis Eichhorn */ - public function viewProductionList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface + public function viewProductionList(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable { $view = new View($this->app, $request, $response); $view->setTemplate('/Modules/Production/Theme/Backend/production-list'); @@ -109,7 +109,7 @@ class Controller extends ModuleAbstract implements WebInterface * @since 1.0.0 * @author Dennis Eichhorn */ - public function viewProductionCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface + public function viewProductionCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable { $view = new View($this->app, $request, $response); $view->setTemplate('/Modules/Production/Theme/Backend/production-create'); @@ -128,7 +128,7 @@ class Controller extends ModuleAbstract implements WebInterface * @since 1.0.0 * @author Dennis Eichhorn */ - public function viewProductionProcessList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface + public function viewProductionProcessList(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable { $view = new View($this->app, $request, $response); $view->setTemplate('/Modules/Production/Theme/Backend/process-list'); @@ -147,7 +147,7 @@ class Controller extends ModuleAbstract implements WebInterface * @since 1.0.0 * @author Dennis Eichhorn */ - public function viewProductionProcessCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface + public function viewProductionProcessCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable { $view = new View($this->app, $request, $response); $view->setTemplate('/Modules/Production/Theme/Backend/process-create'); diff --git a/Theme/Backend/Lang/Navigation.en.lang.php b/Theme/Backend/Lang/Navigation.en.lang.php index 544c085..eaa758f 100644 --- a/Theme/Backend/Lang/Navigation.en.lang.php +++ b/Theme/Backend/Lang/Navigation.en.lang.php @@ -13,8 +13,8 @@ * @version 1.0.0 * @link http://orange-management.com */ -$MODLANG['Navigation'] = [ +return ['Navigation' => [ 'Articles' => 'Articles', 'Production' => 'Production', 'Process' => 'Process', -]; +]]; diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php index 5519bab..7ff7f42 100644 --- a/Theme/Backend/Lang/en.lang.php +++ b/Theme/Backend/Lang/en.lang.php @@ -13,7 +13,7 @@ * @version 1.0.0 * @link http://orange-management.com */ -$MODLANG['Production'] = [ +return ['Production' => [ 'Article' => 'Article', 'Done' => 'Done', 'Due' => 'Due', @@ -27,4 +27,4 @@ $MODLANG['Production'] = [ 'Quantity' => 'Quantity', 'Start' => 'Start', 'Status' => 'Status', -]; +]]; diff --git a/Theme/backend/Lang/Navigation.en.lang.php b/Theme/backend/Lang/Navigation.en.lang.php index 544c085..eaa758f 100644 --- a/Theme/backend/Lang/Navigation.en.lang.php +++ b/Theme/backend/Lang/Navigation.en.lang.php @@ -13,8 +13,8 @@ * @version 1.0.0 * @link http://orange-management.com */ -$MODLANG['Navigation'] = [ +return ['Navigation' => [ 'Articles' => 'Articles', 'Production' => 'Production', 'Process' => 'Process', -]; +]]; diff --git a/Theme/backend/Lang/en.lang.php b/Theme/backend/Lang/en.lang.php index 5519bab..7ff7f42 100644 --- a/Theme/backend/Lang/en.lang.php +++ b/Theme/backend/Lang/en.lang.php @@ -13,7 +13,7 @@ * @version 1.0.0 * @link http://orange-management.com */ -$MODLANG['Production'] = [ +return ['Production' => [ 'Article' => 'Article', 'Done' => 'Done', 'Due' => 'Due', @@ -27,4 +27,4 @@ $MODLANG['Production'] = [ 'Quantity' => 'Quantity', 'Start' => 'Start', 'Status' => 'Status', -]; +]];