Merge pull request #257 from humhub/fix/256-richtext-template-editor

Fix richtext on template editor

docs/CHANGELOG.md

@@ -1,6 +1,10 @@
 Changelog
 =========
 
+1.8.8 (Unreleased)
+-----------------------
+- Fix #256: Fix richtext on template editor
+
 1.8.7 (January 8, 2023)
 -----------------------
 - Enh: Translatable Titles

module.json

@@ -3,7 +3,7 @@
     "name": "Custom Pages",
     "description": "Allows admins to create custom pages (html or markdown) or external links to various navigations (e.g. top navigation, account menu).",
     "keywords": ["pages", "custom", "iframe", "markdown", "link", "navigation", "spaces"],
-    "version": "1.8.7",
+    "version": "1.8.8",
     "homepage": "https://github.com/humhub/custom-pages",
     "humhub": {
         "minVersion": "1.12"

modules/template/controllers/AdminController.php

@@ -217,7 +217,7 @@ public function actionResetElement($id)
         return $this->asJson([
             'success' => true,
             'id' => $id,
-            'output' => TemplateElementAdminRow::widget(['model' => $element, 'saved' => true])
+            'output' => $this->renderAjaxPartial(TemplateElementAdminRow::widget(['model' => $element, 'saved' => true]))
         ]);
     }
 
@@ -318,11 +318,11 @@ public function actionEditMultiple($id)
             TemplateCache::flushByTemplateId($id);
             return $this->asJson([
                 'success' => true,
-                'output' => TemplateContentTable::widget(['template' => $form->template, 'saved' => true])
+                'output' => $this->renderAjaxPartial(TemplateContentTable::widget(['template' => $form->template, 'saved' => true]))
             ]);
         }
 
-        $this->asJson([
+        return $this->asJson([
             'success' => false,
             'output' => $this->renderAjaxPartial(EditMultipleElementsModal::widget([
                 'model' => $form,

modules/template/controllers/OwnerContentController.php

@@ -140,10 +140,10 @@ public function actionEditMultiple($id)
         }
 
         return $this->asJson([
-            'output' => EditMultipleElementsModal::widget([
+            'output' => $this->renderAjaxPartial(EditMultipleElementsModal::widget([
                 'model' => $form,
                 'title' => Yii::t('CustomPagesModule.modules_template_controllers_AdminController', '<strong>Edit</strong> elements of {templateName}', ['templateName' => $form->template->name])
-            ])
+            ]))
         ]);
     }