Enh #526: New event from the global calendar: display "Select space..…

…." prompt instead of first Space
humhub · Jan 22, 2025 · 75d8ce4 · 75d8ce4
1 parent 9046e57
commit 75d8ce4
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/controllers/GlobalController.php b/controllers/GlobalController.php
@@ -131,10 +131,11 @@ private function getFilterSettings()
     public function actionSelect($start = null, $end = null)
     {
         /* @var $user User */
-        $contentContainerSelection = [];
         $user = Yii::$app->user->getIdentity();
+        $canSelectProfileCalendar = $user->moduleManager->isEnabled('calendar') || $user->moduleManager->canEnable('calendar');
 
-        if ($user->moduleManager->isEnabled('calendar') || $user->moduleManager->canEnable('calendar')) {
+        $contentContainerSelection = [];
+        if ($canSelectProfileCalendar) {
             $contentContainerSelection[$user->contentcontainer_id] = Yii::t('CalendarModule.base', 'Profile Calendar');
         }
 
@@ -157,6 +158,7 @@ public function actionSelect($start = null, $end = null)
 
         return $this->renderAjax('selectContainerModal', [
             'contentContainerSelection' => $contentContainerSelection,
+            'canSelectProfileCalendar' => $canSelectProfileCalendar,
             'submitUrl' => Url::to(['/calendar/global/select-submit', 'start' => $start, 'end' => $end]),
         ]);
     }

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -4,6 +4,7 @@ Changelog
 1.7.2 (Unreleased)
 ------------------------
 - Fix #525: Fix Space calendar header
+- Enh #526: New event from the global calendar: display "Select space..." prompt instead of first Space
 
 1.7.1 (January 17, 2025)
 ------------------------

diff --git a/views/global/selectContainerModal.php b/views/global/selectContainerModal.php
@@ -12,6 +12,7 @@
 use humhub\widgets\ModalDialog;
 
 /* @var $contentContainerSelection array */
+/* @var $canSelectProfileCalendar bool */
 /* @var $submitUrl array */
 
 ?>
@@ -20,7 +21,11 @@
 <?php if ($contentContainerSelection): ?>
     <?php $form = ActiveForm::begin() ?>
     <div class="modal-body">
-        <?= Html::dropDownList('contentContainerId', null, $contentContainerSelection, ['class' => 'form-control', 'data-ui-select2' => '']) ?>
+        <?= Html::dropDownList('contentContainerId', null, $contentContainerSelection, [
+            'class' => 'form-control',
+            'data-ui-select2' => '',
+            'prompt' => $canSelectProfileCalendar ? null : Yii::t('CalendarModule.base', 'Select space...'),
+        ]) ?>
     </div>
     <div class="modal-footer">
         <?= ModalButton::submitModal($submitUrl, Yii::t('CalendarModule.base', 'Next')) ?>