Allow managing of global event types from container side

humhub · Sep 27, 2023 · 9a7555e · 9a7555e
1 parent 5ad00c8
commit 9a7555e
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 15 deletions.
diff --git a/controllers/AbstractConfigController.php b/controllers/AbstractConfigController.php
@@ -14,7 +14,9 @@
 use humhub\modules\calendar\models\DefaultSettings;
 use humhub\modules\calendar\models\forms\BasicSettings;
 use humhub\modules\calendar\models\participation\ParticipationSettings;
+use humhub\modules\content\components\ContentContainerActiveRecord;
 use humhub\modules\content\components\ContentContainerController;
+use humhub\modules\content\models\ContentContainer;
 use Yii;
 use yii\data\ActiveDataProvider;
 use yii\web\HttpException;
@@ -84,9 +86,11 @@ public function actionDeleteType($id)
 
         $this->validateEntry($model);
 
-        $model->delete();
+        if ($model->delete()) {
+            $this->view->success(Yii::t('CalendarModule.base', 'Deleted'));
+        }
 
-        return $this->htmlRedirect(Url::toConfigTypes($this->contentContainer));
+        return $this->htmlRedirect(Url::toConfigTypes($this->contentContainer ?? $this->getContainerFromRequest()));
     }
 
     public function actionEditType($id = null)
@@ -100,7 +104,7 @@ public function actionEditType($id = null)
 
         if($model->load(Yii::$app->request->post()) && $model->save()) {
             $this->view->saved();
-            return $this->htmlRedirect(URL::toConfigTypes($this->contentContainer));
+            return $this->htmlRedirect(URL::toConfigTypes($this->contentContainer ?? $this->getContainerFromRequest()));
         }
 
         return $this->renderAjax(static::VIEW_CONFIG_EDIT_TYPE_MODAL, ['model' => $model]);
@@ -164,4 +168,10 @@ protected function getContentContainerId()
     {
         return $this->contentContainer ? $this->contentContainer->contentcontainer_id : null;
     }
+
+    protected function getContainerFromRequest(): ?ContentContainerActiveRecord
+    {
+        $guid = Yii::$app->request->get('guid', Yii::$app->request->post('guid'));
+        return $guid ? ContentContainer::findRecord($guid) : null;
+    }
 }
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -5,6 +5,7 @@ Changelog
 -----------------------
 - Enh #424: Tests for `next` version
 - Enh #423: Add Create Button
+- Enh #379: Allow managing of global event types from container side
 
 1.5.3 (September 14, 2023)
 --------------------------

diff --git a/helpers/Url.php b/helpers/Url.php
@@ -35,11 +35,15 @@ public static function toConfigTypes(ContentContainerActiveRecord $container = n
 
     public static function toEditType(CalendarEntryType $model, ContentContainerActiveRecord $container = null)
     {
-        if($container) {
-            return $container->createUrl('/calendar/container-config/edit-type',  ['id' => $model->id] );
+        if ($model->container instanceof ContentContainerActiveRecord) {
+            return $model->container->createUrl('/calendar/container-config/edit-type',  ['id' => $model->id] );
         }
 
-        return static::to(['/calendar/config/edit-type', 'id' => $model->id]) ;
+        $params = ['/calendar/config/edit-type', 'id' => $model->id];
+        if ($container !== null) {
+            $params['guid'] = $container->guid;
+        }
+        return static::to($params);
     }
 
     public static function toCreateType(ContentContainerActiveRecord $container = null)
@@ -53,11 +57,15 @@ public static function toCreateType(ContentContainerActiveRecord $container = nu
 
     public static function toDeleteType(CalendarEntryType $model, ContentContainerActiveRecord $container = null)
     {
-        if($container) {
-            return $container->createUrl('/calendar/container-config/delete-type', ['id' => $model->id]);
+        if ($model->container instanceof ContentContainerActiveRecord) {
+            return $model->container->createUrl('/calendar/container-config/delete-type', ['id' => $model->id]);
         }
 
-        return static::to(['/calendar/config/delete-type', 'id' => $model->id]);
+        $params = ['/calendar/config/delete-type', 'id' => $model->id];
+        if ($container !== null) {
+            $params['guid'] = $container->guid;
+        }
+        return static::to($params);
     }
 
     public static function toConfigCalendars(ContentContainerActiveRecord $container = null)

diff --git a/views/common/_calendarTypeItem.php b/views/common/_calendarTypeItem.php
@@ -6,8 +6,10 @@
  *
  */
 
-use yii\helpers\Html;
+use humhub\modules\admin\permissions\ManageModules;
+use humhub\widgets\Label;
 use humhub\widgets\ModalButton;
+use yii\helpers\Html;
 
 /* @var $editUrl string */
 /* @var $deleteUrl string */
@@ -23,11 +25,17 @@
             <span class="input-group-addon">
                 <i style="display:inline-block;width:16px;height:16px;background-color: <?= Html::encode($color)?>"></i>
             </span>
-            <input class="form-control" value="<?= Html::encode($title) ?><?= ($disabled ? ' - '.Yii::t('CalendarModule.config', '(disabled)') : '') ?>" title="<?= Yii::t('CalendarModule.base', 'Event type color');?>" type="text" readonly>
+            <span class="form-control" readonly>
+                <?= Html::encode($title) ?>
+                <?php if ($disabled) : ?>
+                    <?= Label::warning(Yii::t('CalendarModule.base', 'disabled')) ?>
+                <?php endif; ?>
+                <?php if ($isSpaceGlobal) : ?>
+                    <?= Label::info(Yii::t('CalendarModule.base', 'global')) ?>
+                <?php endif; ?>
+            </span>
             <span class="input-group-addon">
-                <?php if($isSpaceGlobal) : ?>
-                    <small><?=  Yii::t('CalendarModule.config', '(global)') ?></small>
-                <?php else: ?>
+                <?php if(!$isSpaceGlobal || Yii::$app->user->can([ManageModules::class])) : ?>
                     <?= ModalButton::primary()->load($editUrl)->icon('fa-pencil')->xs() ?>
                     <?php if(!empty($deleteUrl)) : ?>
                         <?= ModalButton::danger()->post($deleteUrl)->confirm(
@@ -39,4 +47,4 @@
             </span>
         </div>
     </div>
-</div>
+</div>