From 22c5528b39ab43bcc77596c575bbc2e0e141a370 Mon Sep 17 00:00:00 2001 From: Yuriy Bakhtin Date: Mon, 2 Dec 2024 14:55:43 +0100 Subject: [PATCH] Template - Add Space Element Type --- docs/CHANGELOG.md | 1 + .../template/controllers/AdminController.php | 6 ++-- .../models/ContentContainerContent.php | 1 - modules/template/models/SpaceContent.php | 31 +++++++++++++++++++ .../widgets/views/spaceContentFormFields.php | 18 +++++++++++ 5 files changed, 54 insertions(+), 3 deletions(-) create mode 100644 modules/template/models/SpaceContent.php create mode 100644 modules/template/widgets/views/spaceContentFormFields.php diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index a39a136e..99135b60 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -6,6 +6,7 @@ Changelog - Enh #354: Template - Add RSS Element Type - Enh #357: Refactor all snippets and container pages to single page class - Enh #358: Refactor page content types +- Enh #359: Template - Add Space Element Type 1.10.11 (Unreleased) -------------------------- diff --git a/modules/template/controllers/AdminController.php b/modules/template/controllers/AdminController.php index d456e25a..a11409d7 100644 --- a/modules/template/controllers/AdminController.php +++ b/modules/template/controllers/AdminController.php @@ -11,16 +11,17 @@ use humhub\modules\custom_pages\modules\template\models\ContainerContent; use humhub\modules\custom_pages\modules\template\models\FileContent; use humhub\modules\custom_pages\modules\template\models\FileDownloadContent; +use humhub\modules\custom_pages\modules\template\models\forms\AddElementForm; +use humhub\modules\custom_pages\modules\template\models\forms\EditElementForm; use humhub\modules\custom_pages\modules\template\models\forms\ImportForm; use humhub\modules\custom_pages\modules\template\models\HumHubRichtextContent; use humhub\modules\custom_pages\modules\template\models\ImageContent; use humhub\modules\custom_pages\modules\template\models\RichtextContent; use humhub\modules\custom_pages\modules\template\models\RssContent; +use humhub\modules\custom_pages\modules\template\models\SpaceContent; use humhub\modules\custom_pages\modules\template\models\TemplateSearch; use humhub\modules\custom_pages\modules\template\models\TextContent; use humhub\modules\custom_pages\modules\template\models\Template; -use humhub\modules\custom_pages\modules\template\models\forms\AddElementForm; -use humhub\modules\custom_pages\modules\template\models\forms\EditElementForm; use humhub\modules\custom_pages\modules\template\models\TemplateElement; use humhub\modules\custom_pages\modules\template\models\UserContent; use humhub\modules\custom_pages\modules\template\services\ExportService; @@ -170,6 +171,7 @@ private function getContentTypes() ContainerContent::$label => ContainerContent::class, RssContent::$label => RssContent::class, UserContent::$label => UserContent::class, + SpaceContent::$label => SpaceContent::class, ]; } diff --git a/modules/template/models/ContentContainerContent.php b/modules/template/models/ContentContainerContent.php index c7a99dce..0848feae 100644 --- a/modules/template/models/ContentContainerContent.php +++ b/modules/template/models/ContentContainerContent.php @@ -12,7 +12,6 @@ use humhub\modules\content\components\ContentContainerActiveRecord; use humhub\modules\content\models\ContentContainer; use humhub\modules\custom_pages\modules\template\widgets\TemplateContentFormFields; -use humhub\modules\user\models\User; use yii\db\IntegrityException; use yii\helpers\ArrayHelper; diff --git a/modules/template/models/SpaceContent.php b/modules/template/models/SpaceContent.php new file mode 100644 index 00000000..46637ea2 --- /dev/null +++ b/modules/template/models/SpaceContent.php @@ -0,0 +1,31 @@ + Yii::t('CustomPagesModule.template', 'Select space'), + ]; + } +} diff --git a/modules/template/widgets/views/spaceContentFormFields.php b/modules/template/widgets/views/spaceContentFormFields.php new file mode 100644 index 00000000..97f5f7b2 --- /dev/null +++ b/modules/template/widgets/views/spaceContentFormFields.php @@ -0,0 +1,18 @@ + +field($model, 'guid')->widget(SpacePickerField::class, [ + 'minInput' => 2, + 'maxSelection' => 1, +]) ?>