Fixing remaining bugs for route-restructure

This commit is contained in:
Dennis Eichhorn 2016-04-09 10:42:22 +02:00
parent d82940c3a9
commit 535e32b561
6 changed files with 12 additions and 10 deletions

View File

@ -15,9 +15,9 @@
*/ */
namespace Modules\Monitoring\Admin; namespace Modules\Monitoring\Admin;
use phpOMS\DataStorage\Database\Pool; use phpOMS\DataStorage\Database\Pool;
use phpOMS\Module\InstallerAbstract; use phpOMS\Module\InstallerAbstract;
use phpOMS\Module\InfoManager;
/** /**
* Monitoring install class. * Monitoring install class.

View File

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

View File

@ -90,7 +90,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 viewMonitoringGeneral(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface public function viewMonitoringGeneral(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
{ {
$view = new View($this->app, $request, $response); $view = new View($this->app, $request, $response);
$view->setTemplate('/Modules/Monitoring/Theme/Backend/monitoring-dashboard'); $view->setTemplate('/Modules/Monitoring/Theme/Backend/monitoring-dashboard');
@ -109,7 +109,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 viewMonitoringLogList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface public function viewMonitoringLogList(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
{ {
$view = new View($this->app, $request, $response); $view = new View($this->app, $request, $response);
$view->setTemplate('/Modules/Monitoring/Theme/Backend/monitoring-logs'); $view->setTemplate('/Modules/Monitoring/Theme/Backend/monitoring-logs');
@ -128,7 +128,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 viewMonitoringLogEntry(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface public function viewMonitoringLogEntry(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
{ {
$view = new View($this->app, $request, $response); $view = new View($this->app, $request, $response);
$view->setTemplate('/Modules/Monitoring/Theme/Backend/monitoring-logs-single'); $view->setTemplate('/Modules/Monitoring/Theme/Backend/monitoring-logs-single');

View File

@ -13,8 +13,8 @@
* @version 1.0.0 * @version 1.0.0
* @link http://orange-management.com * @link http://orange-management.com
*/ */
$MODLANG['Navigation'] = [ return ['Navigation' => [
'List' => 'List', 'List' => 'List',
'Logs' => 'Logs', 'Logs' => 'Logs',
'Monitoring' => 'Monitoring', 'Monitoring' => 'Monitoring',
]; ]];

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['Monitoring'] = [ return ['Monitoring' => [
'Alerts' => 'Alerts', 'Alerts' => 'Alerts',
'All' => 'All', 'All' => 'All',
'Backtrace' => 'Backtrace', 'Backtrace' => 'Backtrace',
@ -51,4 +51,4 @@ $MODLANG['Monitoring'] = [
'Uri' => 'Uri', 'Uri' => 'Uri',
'Version' => 'Version', 'Version' => 'Version',
'Warnings' => 'Warnings', 'Warnings' => 'Warnings',
]; ]];

View File

@ -13,8 +13,8 @@
* @version 1.0.0 * @version 1.0.0
* @link http://orange-management.com * @link http://orange-management.com
*/ */
$MODLANG['Navigation'] = [ return ['Navigation' => [
'List' => 'List', 'List' => 'List',
'Logs' => 'Logs', 'Logs' => 'Logs',
'Monitoring' => 'Monitoring', 'Monitoring' => 'Monitoring',
]; ]];