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

bump

Browse Source
This commit is contained in:
Dennis Eichhorn 2024-03-10 02:24:55 +00:00
parent 3f3ae02708
commit f375214ced
4 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Controller/ApiController.php
View File

@ -3002,7 +3002,7 @@ final class ApiController extends Controller
} }
$installedModules = $this->app->moduleManager->getActiveModules(); $installedModules = $this->app->moduleManager->getActiveModules();
foreach ($installedModules as $name => $module) { foreach ($installedModules as $name => $_) {
$this->app->moduleManager->reInit($name); $this->app->moduleManager->reInit($name);
} }
} }

9
Controller/BackendController.php
View File

@ -23,8 +23,8 @@ use Modules\Admin\Models\GroupPermissionMapper;
use Modules\Admin\Models\ModuleMapper; use Modules\Admin\Models\ModuleMapper;
use Modules\Admin\Models\SettingsEnum; use Modules\Admin\Models\SettingsEnum;
use Modules\Auditor\Models\AuditMapper; use Modules\Auditor\Models\AuditMapper;
use Modules\Media\Models\MediaMapper;
use Modules\Organization\Models\UnitMapper; use Modules\Organization\Models\UnitMapper;
use phpOMS\Asset\AssetType;
use phpOMS\Autoloader; use phpOMS\Autoloader;
use phpOMS\Contract\RenderableInterface; use phpOMS\Contract\RenderableInterface;
use phpOMS\DataStorage\Database\Query\OrderType; use phpOMS\DataStorage\Database\Query\OrderType;
@ -519,6 +519,13 @@ final class BackendController extends Controller
*/ */
public function viewModuleInfo(RequestAbstract $request, ResponseAbstract $response, array $data = []) : RenderableInterface public function viewModuleInfo(RequestAbstract $request, ResponseAbstract $response, array $data = []) : RenderableInterface
{ {
/*
$head = $response->data['Content']->head;
$nonce = $this->app->appSettings->getOption('script-nonce');
$head->addAsset(AssetType::JSLATE, 'Resources/mermaid/mermaid.min.js?v=' . $this->app->version, ['nonce' => $nonce]);
*/
$view = new View($this->app->l11nManager, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Admin/Theme/Backend/modules-info'); $view->setTemplate('/Modules/Admin/Theme/Backend/modules-info');
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response);

31
Theme/Backend/groups-create.tpl.php
View File

@ -27,19 +27,24 @@ echo $this->data['nav']->render(); ?>
autocomplete="off"> autocomplete="off">
<div class="portlet-head"><?= $this->getHtml('Group'); ?></div> <div class="portlet-head"><?= $this->getHtml('Group'); ?></div>
<div class="portlet-body"> <div class="portlet-body">
<table class="layout wf-100" style="table-layout: fixed"> <div class="form-group">
<tbody> <label for="iStatus"><?= $this->getHtml('Status'); ?></label>
<tr><td><label for="iStatus"><?= $this->getHtml('Status'); ?></label> <select id="iStatus" name="status">
<tr><td> <option value="<?= GroupStatus::ACTIVE; ?>" selected><?= $this->getHtml('Active'); ?>
<select id="iStatus" name="status"> <option value="<?= GroupStatus::INACTIVE; ?>"><?= $this->getHtml('Inactive'); ?>
<option value="<?= GroupStatus::ACTIVE; ?>" selected><?= $this->getHtml('Active'); ?> </select>
<option value="<?= GroupStatus::INACTIVE; ?>"><?= $this->getHtml('Inactive'); ?> </div>
</select>
<tr><td><label for="iGname"><?= $this->getHtml('Name'); ?></label> <div class="form-group">
<tr><td><input id="iGname" name="name" type="text" spellcheck="false" autocomplete="off" required> <label for="iGname"><?= $this->getHtml('Name'); ?></label>
<tr><td><?= $this->getData('editor')->render('group-editor'); ?> <input id="iGname" name="name" type="text" spellcheck="false" autocomplete="off" required>
<tr><td><?= $this->getData('editor')->getData('text')->render('group-editor', 'description', 'fGroupCreate'); ?> </div>
</table>
<div class="form-group">
<?= $this->getData('editor')->render('group-editor'); ?>
</div>
<?= $this->getData('editor')->getData('text')->render('group-editor', 'description', 'fGroupCreate'); ?>
</div> </div>
<div class="portlet-foot"> <div class="portlet-foot">
<input type="submit" id="iCreate" name="create" value="<?= $this->getHtml('Create', '0', '0'); ?>"> <input type="submit" id="iCreate" name="create" value="<?= $this->getHtml('Create', '0', '0'); ?>">

6
Theme/Backend/groups-view.tpl.php
View File

@ -69,7 +69,11 @@ echo $this->data['nav']->render(); ?>
<?php endforeach; ?> <?php endforeach; ?>
</select> </select>
</div> </div>
<?= $this->getData('editor')->render('group-editor'); ?>
<div class="form-group">
<?= $this->getData('editor')->render('group-editor'); ?>
</div>
<?= $this->getData('editor')->getData('text')->render( <?= $this->getData('editor')->getData('text')->render(
'group-editor', 'group-editor',
'description', 'description',