Jingga/oms-Admin
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Admin.git synced 2026-02-16 12:28:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

improve baseline

Browse Source
This commit is contained in:
Dennis Eichhorn 2020-02-06 23:54:01 +01:00
parent 01eaf402b1
commit 0c31e88918
5 changed files with 30 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Controller/ApiController.php
View File

@ -1021,13 +1021,15 @@ final class ApiController extends Controller
{ {
$directories = \glob(__DIR__ . '/../../../Web/*' , \GLOB_ONLYDIR); $directories = \glob(__DIR__ . '/../../../Web/*' , \GLOB_ONLYDIR);
foreach ($directories as $directory) { if ($directories !== false) {
if (\file_exists($path = $directory . '/Routes.php')) { foreach ($directories as $directory) {
\file_put_contents($path, '<?php return [];'); if (\file_exists($path = $directory . '/Routes.php')) {
} \file_put_contents($path, '<?php return [];');
}
if (\file_exists($path = $directory . '/Hooks.php')) { if (\file_exists($path = $directory . '/Hooks.php')) {
\file_put_contents($path, '<?php return [];'); \file_put_contents($path, '<?php return [];');
}
} }
} }

28
Controller/BackendController.php
View File

@ -59,7 +59,7 @@ final class BackendController extends Controller
*/ */
public function viewSettingsGeneral(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface public function viewSettingsGeneral(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
{ {
$view = new View($this->app, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$settings = $this->app->appSettings->get([ $settings = $this->app->appSettings->get([
1000000001, 1000000002, 1000000003, 1000000004, 1000000005, 1000000006, 1000000007, 1000000008, 1000000009, 1000000001, 1000000002, 1000000003, 1000000004, 1000000005, 1000000006, 1000000007, 1000000008, 1000000009,
1000000010, 1000000011, 1000000012, 1000000013, 1000000014, 1000000015, 1000000016, 1000000017, 1000000018, 1000000019, 1000000010, 1000000011, 1000000012, 1000000013, 1000000014, 1000000015, 1000000016, 1000000017, 1000000018, 1000000019,
@ -94,7 +94,7 @@ final class BackendController extends Controller
*/ */
public function viewEmptyCommand(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface public function viewEmptyCommand(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
{ {
$view = new View($this->app, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Admin/Theme/Console/empty-command'); $view->setTemplate('/Modules/Admin/Theme/Console/empty-command');
return $view; return $view;
@ -113,7 +113,7 @@ final class BackendController extends Controller
*/ */
public function viewAccountList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface public function viewAccountList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
{ {
$view = new View($this->app, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Admin/Theme/Backend/accounts-list'); $view->setTemplate('/Modules/Admin/Theme/Backend/accounts-list');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000104001, $request, $response)); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000104001, $request, $response));
$view->setData('list:elements', AccountMapper::getNewest(50, null, RelationType::NONE)); $view->setData('list:elements', AccountMapper::getNewest(50, null, RelationType::NONE));
@ -135,7 +135,7 @@ final class BackendController extends Controller
*/ */
public function viewAccountSettings(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface public function viewAccountSettings(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
{ {
$view = new View($this->app, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Admin/Theme/Backend/accounts-single'); $view->setTemplate('/Modules/Admin/Theme/Backend/accounts-single');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000104001, $request, $response)); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000104001, $request, $response));
$view->addData('account', AccountMapper::get((int) $request->getData('id'), RelationType::ALL, null, 2)); $view->addData('account', AccountMapper::get((int) $request->getData('id'), RelationType::ALL, null, 2));
@ -150,7 +150,7 @@ final class BackendController extends Controller
$view->addData('permissions', $permissions); $view->addData('permissions', $permissions);
$accGrpSelector = new \Modules\Admin\Theme\Backend\Components\GroupTagSelector\GroupTagSelectorView($this->app, $request, $response); $accGrpSelector = new \Modules\Admin\Theme\Backend\Components\GroupTagSelector\GroupTagSelectorView($this->app->l11nManager, $request, $response);
$view->addData('grpSelector', $accGrpSelector); $view->addData('grpSelector', $accGrpSelector);
return $view; return $view;
@ -169,7 +169,7 @@ final class BackendController extends Controller
*/ */
public function viewAccountCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface public function viewAccountCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
{ {
$view = new View($this->app, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Admin/Theme/Backend/accounts-create'); $view->setTemplate('/Modules/Admin/Theme/Backend/accounts-create');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000104001, $request, $response)); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000104001, $request, $response));
@ -189,7 +189,7 @@ final class BackendController extends Controller
*/ */
public function viewGroupList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface public function viewGroupList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
{ {
$view = new View($this->app, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Admin/Theme/Backend/groups-list'); $view->setTemplate('/Modules/Admin/Theme/Backend/groups-list');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000103001, $request, $response)); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000103001, $request, $response));
$view->setData('list:elements', GroupMapper::getAll(RelationType::NONE)); $view->setData('list:elements', GroupMapper::getAll(RelationType::NONE));
@ -210,7 +210,7 @@ final class BackendController extends Controller
*/ */
public function viewGroupSettings(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface public function viewGroupSettings(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
{ {
$view = new View($this->app, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Admin/Theme/Backend/groups-single'); $view->setTemplate('/Modules/Admin/Theme/Backend/groups-single');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000103001, $request, $response)); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000103001, $request, $response));
$view->addData('group', GroupMapper::get((int) $request->getData('id'), RelationType::ALL, null, 2)); $view->addData('group', GroupMapper::get((int) $request->getData('id'), RelationType::ALL, null, 2));
@ -225,10 +225,10 @@ final class BackendController extends Controller
$view->addData('permissions', $permissions); $view->addData('permissions', $permissions);
$accGrpSelector = new \Modules\Profile\Theme\Backend\Components\AccountGroupSelector\BaseView($this->app, $request, $response); $accGrpSelector = new \Modules\Profile\Theme\Backend\Components\AccountGroupSelector\BaseView($this->app->l11nManager, $request, $response);
$view->addData('accGrpSelector', $accGrpSelector); $view->addData('accGrpSelector', $accGrpSelector);
$editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app, $request, $response); $editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response);
$view->addData('editor', $editor); $view->addData('editor', $editor);
return $view; return $view;
@ -247,11 +247,11 @@ final class BackendController extends Controller
*/ */
public function viewGroupCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface public function viewGroupCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
{ {
$view = new View($this->app, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Admin/Theme/Backend/groups-create'); $view->setTemplate('/Modules/Admin/Theme/Backend/groups-create');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000103001, $request, $response)); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000103001, $request, $response));
$editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app, $request, $response); $editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response);
$view->addData('editor', $editor); $view->addData('editor', $editor);
return $view; return $view;
@ -270,7 +270,7 @@ final class BackendController extends Controller
*/ */
public function viewModuleList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface public function viewModuleList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
{ {
$view = new View($this->app, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Admin/Theme/Backend/modules-list'); $view->setTemplate('/Modules/Admin/Theme/Backend/modules-list');
return $view; return $view;
@ -289,7 +289,7 @@ final class BackendController extends Controller
*/ */
public function viewModuleProfile(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface public function viewModuleProfile(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
{ {
$view = new View($this->app, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Admin/Theme/Backend/modules-single'); $view->setTemplate('/Modules/Admin/Theme/Backend/modules-single');
$id = $request->getData('id') ?? ''; $id = $request->getData('id') ?? '';

2
Controller/ConsoleController.php
View File

@ -48,7 +48,7 @@ final class ConsoleController extends Controller
*/ */
public function viewEmptyCommand(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface public function viewEmptyCommand(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
{ {
$view = new View($this->app, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Admin/Theme/Console/empty-command'); $view->setTemplate('/Modules/Admin/Theme/Console/empty-command');
return $view; return $view;

6
Theme/Backend/Components/GroupTagSelector/GroupTagSelectorPopupView.php
View File

@ -14,7 +14,7 @@ declare(strict_types=1);
namespace Modules\Admin\Theme\Backend\Components\GroupTagSelector; namespace Modules\Admin\Theme\Backend\Components\GroupTagSelector;
use phpOMS\ApplicationAbstract; use phpOMS\Localization\L11nManager;
use phpOMS\Message\RequestAbstract; use phpOMS\Message\RequestAbstract;
use phpOMS\Message\ResponseAbstract; use phpOMS\Message\ResponseAbstract;
use phpOMS\Views\View; use phpOMS\Views\View;
@ -35,9 +35,9 @@ class GroupTagSelectorPopupView extends View
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function __construct(ApplicationAbstract $app, RequestAbstract $request, ResponseAbstract $response) public function __construct(L11nManager $l11n = null, RequestAbstract $request, ResponseAbstract $response)
{ {
parent::__construct($app, $request, $response); parent::__construct($l11n, $request, $response);
$this->setTemplate('/Modules/Admin/Theme/Backend/Components/GroupTagSelector/group-selector-popup'); $this->setTemplate('/Modules/Admin/Theme/Backend/Components/GroupTagSelector/group-selector-popup');
} }

8
Theme/Backend/Components/GroupTagSelector/GroupTagSelectorView.php
View File

@ -14,7 +14,7 @@ declare(strict_types=1);
namespace Modules\Admin\Theme\Backend\Components\GroupTagSelector; namespace Modules\Admin\Theme\Backend\Components\GroupTagSelector;
use phpOMS\ApplicationAbstract; use phpOMS\Localization\L11nManager;
use phpOMS\Message\RequestAbstract; use phpOMS\Message\RequestAbstract;
use phpOMS\Message\ResponseAbstract; use phpOMS\Message\ResponseAbstract;
use phpOMS\Views\View; use phpOMS\Views\View;
@ -36,12 +36,12 @@ class GroupTagSelectorView extends View
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function __construct(ApplicationAbstract $app, RequestAbstract $request, ResponseAbstract $response) public function __construct(L11nManager $l11n, RequestAbstract $request, ResponseAbstract $response)
{ {
parent::__construct($app, $request, $response); parent::__construct($l11n, $request, $response);
$this->setTemplate('/Modules/Admin/Theme/Backend/Components/GroupTagSelector/group-selector'); $this->setTemplate('/Modules/Admin/Theme/Backend/Components/GroupTagSelector/group-selector');
$view = new GroupTagSelectorPopupView($app, $request, $response); $view = new GroupTagSelectorPopupView($l11n, $request, $response);
$this->addData('group-selector-popup', $view); $this->addData('group-selector-popup', $view);
} }