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

bump

Browse Source
This commit is contained in:
Dennis Eichhorn 2024-01-30 21:29:20 +00:00
parent 35f5c851b7
commit ec95129bf9
7 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Controller/ApiController.php
View File

@ -1141,7 +1141,7 @@ final class ApiController extends Controller
} }
// handle Routes of already installed modules // handle Routes of already installed modules
foreach ($installed as $module => $data) { foreach ($installed as $module => $_) {
$class = '\Modules\\' . $module . '\Admin\Status'; $class = '\Modules\\' . $module . '\Admin\Status';
$moduleInfo = new ModuleInfo(__DIR__ . '/../../../Modules/' . $module . '/info.json'); $moduleInfo = new ModuleInfo(__DIR__ . '/../../../Modules/' . $module . '/info.json');

7
Controller/BackendController.php
View File

@ -205,7 +205,12 @@ final class BackendController extends Controller
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000104001, $request, $response); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000104001, $request, $response);
/** @var \Modules\Admin\Models\Account $account */ /** @var \Modules\Admin\Models\Account $account */
$account = AccountMapper::get()->with('groups')->with('l11n')->where('id', (int) $request->getData('id'))->execute(); $account = AccountMapper::get()
->with('groups')
->with('l11n')
->where('id', (int) $request->getData('id'))
->execute();
if ($account->l11n->id === 0) { if ($account->l11n->id === 0) {
$account->l11n->loadFromLanguage($request->header->l11n->language); $account->l11n->loadFromLanguage($request->header->l11n->language);
} }

2
Theme/Backend/Components/AccountPermissionSelector/BaseView.php
View File

@ -59,7 +59,7 @@ class BaseView extends View
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function __construct(?L11nManager $l11n = null, RequestAbstract $request, ResponseAbstract $response) public function __construct(L11nManager $l11n, RequestAbstract $request, ResponseAbstract $response)
{ {
parent::__construct($l11n, $request, $response); parent::__construct($l11n, $request, $response);
$this->setTemplate('/Modules/Admin/Theme/Backend/Components/AccountPermissionSelector/account-permission-selector'); $this->setTemplate('/Modules/Admin/Theme/Backend/Components/AccountPermissionSelector/account-permission-selector');

2
Theme/Backend/Components/AddressEditor/AddressView.php
View File

@ -81,7 +81,7 @@ class AddressView extends View
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function __construct(?L11nManager $l11n = null, RequestAbstract $request, ResponseAbstract $response) public function __construct(L11nManager $l11n, RequestAbstract $request, ResponseAbstract $response)
{ {
parent::__construct($l11n, $request, $response); parent::__construct($l11n, $request, $response);
$this->setTemplate('/Modules/Admin/Theme/Backend/Components/AddressEditor/addresses'); $this->setTemplate('/Modules/Admin/Theme/Backend/Components/AddressEditor/addresses');

2
Theme/Backend/Components/ContactEditor/ContactView.php
View File

@ -81,7 +81,7 @@ class ContactView extends View
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function __construct(?L11nManager $l11n = null, RequestAbstract $request, ResponseAbstract $response) public function __construct(L11nManager $l11n, RequestAbstract $request, ResponseAbstract $response)
{ {
parent::__construct($l11n, $request, $response); parent::__construct($l11n, $request, $response);
$this->setTemplate('/Modules/Admin/Theme/Backend/Components/ContactEditor/contacts'); $this->setTemplate('/Modules/Admin/Theme/Backend/Components/ContactEditor/contacts');

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

@ -41,7 +41,7 @@ class GroupTagSelectorPopupView extends View
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function __construct(?L11nManager $l11n = null, RequestAbstract $request, ResponseAbstract $response) public function __construct(L11nManager $l11n, RequestAbstract $request, ResponseAbstract $response)
{ {
parent::__construct($l11n, $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');

2
Theme/Backend/modules-list.tpl.php
View File

@ -85,7 +85,7 @@ $tableView->setObjects($modules);
} }
?> ?>
<tr tabindex="0" data-href="<?= $url; ?>"> <tr tabindex="0" data-href="<?= $url; ?>">
<td data-label="<?= $this->getHtml('ID', '0', '0'); ?>"><a href="<?= $url; ?>"><?= $module->id; ?></a> <td data-label="<?= $this->getHtml('ID', '0', '0'); ?>"><a href="<?= $url; ?>"><?= $module->getId(); ?></a>
<td data-label="<?= $this->getHtml('Name'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($module->getExternalName()); ?></a> <td data-label="<?= $this->getHtml('Name'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($module->getExternalName()); ?></a>
<td data-label="<?= $this->getHtml('Version'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($module->getVersion()); ?></a> <td data-label="<?= $this->getHtml('Version'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($module->getVersion()); ?></a>
<td data-label="<?= $this->getHtml('Status'); ?>"> <td data-label="<?= $this->getHtml('Status'); ?>">