Enh: Better support for custom caches (#6888)

* Enh: Better support for custom caches * Updated Changelog
humhub · Mar 16, 2024 · 152b0a0 · 152b0a0
1 parent 99cb0fa
commit 152b0a0
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@ HumHub Changelog
 
 1.15.4 (Unreleased)
 -------------------
+- Enh #6888: Better support for custom caches
 - Fix #6851: Update HumHub Prosemirror (fixes legacy emoji support)
 - Fix #6859: Hide scheduled and draft content on other user profile pages
 - Fix #6871: Cache is not deleted after deleting a value in the settings

diff --git a/protected/humhub/modules/admin/models/forms/CacheSettingsForm.php b/protected/humhub/modules/admin/models/forms/CacheSettingsForm.php
@@ -40,11 +40,16 @@ public function init()
     public function rules()
     {
         return [
-            [['type', 'expireTime'], 'required'],
+            [['expireTime'], 'required'],
             ['reloadableScripts', 'string'],
             ['type', 'checkCacheType'],
             ['expireTime', 'integer'],
-            ['type', 'in', 'range' => array_keys($this->getTypes())],
+            ['type', 'required', 'when' => function () {
+                return !Yii::$app->settings->isFixed('cache.class');
+            }],
+            ['type', 'in', 'range' => array_keys($this->getTypes()), 'when' => function () {
+                return !Yii::$app->settings->isFixed('cache.class');
+            }],
         ];
     }
 
@@ -122,7 +127,7 @@ public static function getReloadableScriptUrls()
 
     public function getReloadableScriptsAsArray()
     {
-        if(is_string($this->reloadableScripts) && !empty($this->reloadableScripts)) {
+        if (is_string($this->reloadableScripts) && !empty($this->reloadableScripts)) {
             return array_map('trim', explode("\n", $this->reloadableScripts));
         }
 

diff --git a/protected/humhub/modules/admin/views/setting/caching.php b/protected/humhub/modules/admin/views/setting/caching.php
@@ -13,8 +13,9 @@
 
     <?php $form = ActiveForm::begin(['acknowledge' => true]); ?>
 
-        <?= $form->field($model, 'type')->dropDownList($cacheTypes, ['readonly' => Yii::$app->settings->isFixed('cache.class')]) ?>
-
+        <?php if (!Yii::$app->settings->isFixed('cache.class')): ?>
+            <?= $form->field($model, 'type')->dropDownList($cacheTypes, ['readonly' => Yii::$app->settings->isFixed('cache.class')]) ?>
+        <?php endif; ?>
 
         <?= $form->field($model, 'expireTime')->textInput(['readonly' => Yii::$app->settings->isFixed('cache.expireTime')]) ?>