Fixing remaining bugs for route-restructure

This commit is contained in:
Dennis Eichhorn 2016-04-09 10:42:22 +02:00
parent 7ceedface8
commit d8bde155a3
6 changed files with 18 additions and 15 deletions

View File

@ -17,6 +17,7 @@ namespace Modules\Admin\Admin;
use phpOMS\DataStorage\Database\DatabaseType; use phpOMS\DataStorage\Database\DatabaseType;
use phpOMS\DataStorage\Database\Pool; use phpOMS\DataStorage\Database\Pool;
use phpOMS\Module\InfoManager;
use phpOMS\Module\InstallerAbstract; use phpOMS\Module\InstallerAbstract;
/** /**

View File

@ -1,5 +1,7 @@
<?php <?php
use phpOMS\Router\RouteVerb;
return [ return [
'^.*/backend/admin/settings/general.*$' => [ '^.*/backend/admin/settings/general.*$' => [
[ [

View File

@ -89,7 +89,7 @@ class Controller extends ModuleAbstract implements WebInterface
* @since 1.0.0 * @since 1.0.0
* @author Dennis Eichhorn <d.eichhorn@oms.com> * @author Dennis Eichhorn <d.eichhorn@oms.com>
*/ */
public function viewSettingsGeneral(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface public function viewSettingsGeneral(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
{ {
$settings = $this->app->appSettings->get([ $settings = $this->app->appSettings->get([
1000000009, 1000000009,
@ -129,7 +129,7 @@ class Controller extends ModuleAbstract implements WebInterface
* @since 1.0.0 * @since 1.0.0
* @author Dennis Eichhorn <d.eichhorn@oms.com> * @author Dennis Eichhorn <d.eichhorn@oms.com>
*/ */
public function viewAccountList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface public function viewAccountList(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
{ {
$view = new View($this->app, $request, $response); $view = new View($this->app, $request, $response);
$view->setTemplate('/Modules/Admin/Theme/Backend/accounts-list'); $view->setTemplate('/Modules/Admin/Theme/Backend/accounts-list');
@ -152,7 +152,7 @@ class Controller extends ModuleAbstract implements WebInterface
* @since 1.0.0 * @since 1.0.0
* @author Dennis Eichhorn <d.eichhorn@oms.com> * @author Dennis Eichhorn <d.eichhorn@oms.com>
*/ */
public function viewAccountSettings(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface public function viewAccountSettings(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
{ {
$view = new View($this->app, $request, $response); $view = new View($this->app, $request, $response);
$view->setTemplate('/Modules/Admin/Theme/Backend/accounts-single'); $view->setTemplate('/Modules/Admin/Theme/Backend/accounts-single');
@ -174,7 +174,7 @@ class Controller extends ModuleAbstract implements WebInterface
* @since 1.0.0 * @since 1.0.0
* @author Dennis Eichhorn <d.eichhorn@oms.com> * @author Dennis Eichhorn <d.eichhorn@oms.com>
*/ */
public function viewAccountCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface public function viewAccountCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
{ {
$view = new View($this->app, $request, $response); $view = new View($this->app, $request, $response);
$view->setTemplate('/Modules/Admin/Theme/Backend/accounts-create'); $view->setTemplate('/Modules/Admin/Theme/Backend/accounts-create');
@ -193,7 +193,7 @@ class Controller extends ModuleAbstract implements WebInterface
* @since 1.0.0 * @since 1.0.0
* @author Dennis Eichhorn <d.eichhorn@oms.com> * @author Dennis Eichhorn <d.eichhorn@oms.com>
*/ */
public function viewGroupList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface public function viewGroupList(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
{ {
$view = new View($this->app, $request, $response); $view = new View($this->app, $request, $response);
$view->setTemplate('/Modules/Admin/Theme/Backend/groups-list'); $view->setTemplate('/Modules/Admin/Theme/Backend/groups-list');
@ -215,7 +215,7 @@ class Controller extends ModuleAbstract implements WebInterface
* @since 1.0.0 * @since 1.0.0
* @author Dennis Eichhorn <d.eichhorn@oms.com> * @author Dennis Eichhorn <d.eichhorn@oms.com>
*/ */
public function viewGroupSettings(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface public function viewGroupSettings(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
{ {
$view = new View($this->app, $request, $response); $view = new View($this->app, $request, $response);
$view->setTemplate('/Modules/Admin/Theme/Backend/groups-single'); $view->setTemplate('/Modules/Admin/Theme/Backend/groups-single');
@ -237,7 +237,7 @@ class Controller extends ModuleAbstract implements WebInterface
* @since 1.0.0 * @since 1.0.0
* @author Dennis Eichhorn <d.eichhorn@oms.com> * @author Dennis Eichhorn <d.eichhorn@oms.com>
*/ */
public function viewGroupCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface public function viewGroupCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
{ {
$view = new View($this->app, $request, $response); $view = new View($this->app, $request, $response);
$view->setTemplate('/Modules/Admin/Theme/Backend/groups-create'); $view->setTemplate('/Modules/Admin/Theme/Backend/groups-create');
@ -256,7 +256,7 @@ class Controller extends ModuleAbstract implements WebInterface
* @since 1.0.0 * @since 1.0.0
* @author Dennis Eichhorn <d.eichhorn@oms.com> * @author Dennis Eichhorn <d.eichhorn@oms.com>
*/ */
public function viewModuleList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface public function viewModuleList(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
{ {
$view = new View($this->app, $request, $response); $view = new View($this->app, $request, $response);
$view->setTemplate('/Modules/Admin/Theme/Backend/modules-list'); $view->setTemplate('/Modules/Admin/Theme/Backend/modules-list');
@ -274,7 +274,7 @@ class Controller extends ModuleAbstract implements WebInterface
* @since 1.0.0 * @since 1.0.0
* @author Dennis Eichhorn <d.eichhorn@oms.com> * @author Dennis Eichhorn <d.eichhorn@oms.com>
*/ */
public function viewModuleProfile(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface public function viewModuleProfile(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
{ {
$view = new View($this->app, $request, $response); $view = new View($this->app, $request, $response);
$view->setTemplate('/Modules/Admin/Theme/Backend/modules-single'); $view->setTemplate('/Modules/Admin/Theme/Backend/modules-single');

View File

@ -13,7 +13,7 @@
* @version 1.0.0 * @version 1.0.0
* @link http://orange-management.com * @link http://orange-management.com
*/ */
$MODLANG['Navigation'] = [ return ['Navigation' => [
'Admin' => 'Admin', 'Admin' => 'Admin',
'Create' => 'Create', 'Create' => 'Create',
'Front' => 'Front', 'Front' => 'Front',
@ -24,4 +24,4 @@ $MODLANG['Navigation'] = [
'Modules' => 'Modules', 'Modules' => 'Modules',
'Account' => 'Account', 'Account' => 'Account',
'Accounts' => 'Accounts', 'Accounts' => 'Accounts',
]; ]];

View File

@ -13,7 +13,7 @@
* @version 1.0.0 * @version 1.0.0
* @link http://orange-management.com * @link http://orange-management.com
*/ */
$MODLANG['Admin'] = [ return ['Admin' => [
'Account' => 'Account', 'Account' => 'Account',
'Accounts' => 'Accounts', 'Accounts' => 'Accounts',
'Active' => 'Active', 'Active' => 'Active',
@ -101,4 +101,4 @@ $MODLANG['Admin'] = [
'i:rem' => 'IP address or URL for remote access.', 'i:rem' => 'IP address or URL for remote access.',
'i:rc' => 'Forcing re-cache for every user.', 'i:rc' => 'Forcing re-cache for every user.',
'i:timef' => 'Time format.', 'i:timef' => 'Time format.',
]; ]];

View File

@ -13,7 +13,7 @@
* @version 1.0.0 * @version 1.0.0
* @link http://orange-management.com * @link http://orange-management.com
*/ */
$MODLANG['Navigation'] = [ return ['Navigation' => [
'Admin' => 'Admin', 'Admin' => 'Admin',
'Create' => 'Create', 'Create' => 'Create',
'Front' => 'Front', 'Front' => 'Front',
@ -24,4 +24,4 @@ $MODLANG['Navigation'] = [
'Modules' => 'Modules', 'Modules' => 'Modules',
'Account' => 'Account', 'Account' => 'Account',
'Accounts' => 'Accounts', 'Accounts' => 'Accounts',
]; ]];