From f375214ced1a377035bc469fc5183d7f54b2935d Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sun, 10 Mar 2024 02:24:55 +0000 Subject: [PATCH] bump --- Controller/ApiController.php | 2 +- Controller/BackendController.php | 9 ++++++++- Theme/Backend/groups-create.tpl.php | 31 +++++++++++++++++------------ Theme/Backend/groups-view.tpl.php | 6 +++++- 4 files changed, 32 insertions(+), 16 deletions(-) diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 1396ba3..6a63cff 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -3002,7 +3002,7 @@ final class ApiController extends Controller } $installedModules = $this->app->moduleManager->getActiveModules(); - foreach ($installedModules as $name => $module) { + foreach ($installedModules as $name => $_) { $this->app->moduleManager->reInit($name); } } diff --git a/Controller/BackendController.php b/Controller/BackendController.php index c3ddf32..847d2b2 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -23,8 +23,8 @@ use Modules\Admin\Models\GroupPermissionMapper; use Modules\Admin\Models\ModuleMapper; use Modules\Admin\Models\SettingsEnum; use Modules\Auditor\Models\AuditMapper; -use Modules\Media\Models\MediaMapper; use Modules\Organization\Models\UnitMapper; +use phpOMS\Asset\AssetType; use phpOMS\Autoloader; use phpOMS\Contract\RenderableInterface; 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 { + /* + $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->setTemplate('/Modules/Admin/Theme/Backend/modules-info'); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response); diff --git a/Theme/Backend/groups-create.tpl.php b/Theme/Backend/groups-create.tpl.php index bf6273f..729d3ff 100755 --- a/Theme/Backend/groups-create.tpl.php +++ b/Theme/Backend/groups-create.tpl.php @@ -27,19 +27,24 @@ echo $this->data['nav']->render(); ?> autocomplete="off">
getHtml('Group'); ?>
- - -
-
- -
-
-
getData('editor')->render('group-editor'); ?> -
getData('editor')->getData('text')->render('group-editor', 'description', 'fGroupCreate'); ?> -
+
+ + +
+ +
+ + +
+ +
+ getData('editor')->render('group-editor'); ?> +
+ + getData('editor')->getData('text')->render('group-editor', 'description', 'fGroupCreate'); ?>
diff --git a/Theme/Backend/groups-view.tpl.php b/Theme/Backend/groups-view.tpl.php index 29df82d..1e792a6 100644 --- a/Theme/Backend/groups-view.tpl.php +++ b/Theme/Backend/groups-view.tpl.php @@ -69,7 +69,11 @@ echo $this->data['nav']->render(); ?>
- getData('editor')->render('group-editor'); ?> + +
+ getData('editor')->render('group-editor'); ?> +
+ getData('editor')->getData('text')->render( 'group-editor', 'description',