Jingga/oms-Organization
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Organization.git synced 2026-02-13 14:58:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixing remaining bugs for route-restructure

Browse Source
This commit is contained in:
Dennis Eichhorn 2016-04-09 10:42:22 +02:00
parent b960b79b84
commit cd09c410da
5 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Admin/Installer.php
View File

@ -17,6 +17,7 @@ namespace Modules\Organization\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;
/** /**

2
Admin/Routes/http.php
View File

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

18
Controller.php
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 viewUnitList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface public function viewUnitList(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
{ {
$view = new View($this->app, $request, $response); $view = new View($this->app, $request, $response);
$view->setTemplate('/Modules/Organization/Theme/Backend/unit-list'); $view->setTemplate('/Modules/Organization/Theme/Backend/unit-list');
@ -112,7 +112,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 viewUnitProfile(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface public function viewUnitProfile(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
{ {
$view = new View($this->app, $request, $response); $view = new View($this->app, $request, $response);
$view->setTemplate('/Modules/Organization/Theme/Backend/unit-profile'); $view->setTemplate('/Modules/Organization/Theme/Backend/unit-profile');
@ -134,7 +134,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 viewUnitCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface public function viewUnitCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
{ {
$view = new View($this->app, $request, $response); $view = new View($this->app, $request, $response);
$view->setTemplate('/Modules/Organization/Theme/Backend/unit-create'); $view->setTemplate('/Modules/Organization/Theme/Backend/unit-create');
@ -156,7 +156,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 viewDepartmentList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface public function viewDepartmentList(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
{ {
$view = new View($this->app, $request, $response); $view = new View($this->app, $request, $response);
$view->setTemplate('/Modules/Organization/Theme/Backend/department-list'); $view->setTemplate('/Modules/Organization/Theme/Backend/department-list');
@ -178,7 +178,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 viewDepartmentProfile(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface public function viewDepartmentProfile(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
{ {
$view = new View($this->app, $request, $response); $view = new View($this->app, $request, $response);
$view->setTemplate('/Modules/Organization/Theme/Backend/department-profile'); $view->setTemplate('/Modules/Organization/Theme/Backend/department-profile');
@ -200,7 +200,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 viewDepartmentCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface public function viewDepartmentCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
{ {
$view = new View($this->app, $request, $response); $view = new View($this->app, $request, $response);
$view->setTemplate('/Modules/Organization/Theme/Backend/department-create'); $view->setTemplate('/Modules/Organization/Theme/Backend/department-create');
@ -222,7 +222,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 viewPositionList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface public function viewPositionList(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
{ {
$view = new View($this->app, $request, $response); $view = new View($this->app, $request, $response);
$view->setTemplate('/Modules/Organization/Theme/Backend/position-list'); $view->setTemplate('/Modules/Organization/Theme/Backend/position-list');
@ -241,7 +241,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 viewPositionProfile(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface public function viewPositionProfile(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
{ {
$view = new View($this->app, $request, $response); $view = new View($this->app, $request, $response);
$view->setTemplate('/Modules/Organization/Theme/Backend/position-profile'); $view->setTemplate('/Modules/Organization/Theme/Backend/position-profile');
@ -260,7 +260,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 viewPositionCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface public function viewPositionCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
{ {
$view = new View($this->app, $request, $response); $view = new View($this->app, $request, $response);
$view->setTemplate('/Modules/Organization/Theme/Backend/position-create'); $view->setTemplate('/Modules/Organization/Theme/Backend/position-create');

4
Theme/Backend/Lang/Navigation.en.lang.php
View File

@ -13,9 +13,9 @@
* @version 1.0.0 * @version 1.0.0
* @link http://orange-management.com * @link http://orange-management.com
*/ */
$MODLANG['Navigation'] = [ return ['Navigation' => [
'Departments' => 'Departments', 'Departments' => 'Departments',
'Organization' => 'Organization', 'Organization' => 'Organization',
'Positions' => 'Positions', 'Positions' => 'Positions',
'Units' => 'Units', 'Units' => 'Units',
]; ]];

4
Theme/Backend/Lang/en.lang.php
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['Organization'] = [ return ['Organization' => [
'Active' => 'Active', 'Active' => 'Active',
'Department' => 'Department', 'Department' => 'Department',
'Departments' => 'Departments', 'Departments' => 'Departments',
@ -24,4 +24,4 @@ $MODLANG['Organization'] = [
'Status' => 'Status', 'Status' => 'Status',
'Unit' => 'Unit', 'Unit' => 'Unit',
'Units' => 'Units', 'Units' => 'Units',
]; ]];