[#1656] Added CKEditor widget to category description field

maykinmedia · Oct 3, 2023 · b092fc6 · b092fc6
1 parent ddaa5e9
commit b092fc6
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 23 deletions.
diff --git a/src/open_inwoner/components/templatetags/category_tags.py b/src/open_inwoner/components/templatetags/category_tags.py
diff --git a/src/open_inwoner/pdc/models/category.py b/src/open_inwoner/pdc/models/category.py
@@ -6,6 +6,7 @@
 from treebeard.exceptions import InvalidMoveToDescendant
 from treebeard.mp_tree import MP_MoveHandler, MP_Node
 
+from ...utils.ckeditor import get_rendered_content
 from ..managers import CategoryPublishedQueryset
 
 

diff --git a/src/open_inwoner/pdc/views.py b/src/open_inwoner/pdc/views.py
@@ -12,6 +12,7 @@
 from open_inwoner.questionnaire.models import QuestionnaireStep
 from open_inwoner.utils.views import LoginMaybeRequiredMixin
 
+from ..utils.ckeditor import get_rendered_content
 from ..utils.views import CommonPageMixin
 from .choices import YesNo
 from .forms import ProductFinderForm
@@ -173,6 +174,9 @@ def get_context_data(self, **kwargs):
         context["questionnaire_roots"] = QuestionnaireStep.get_root_nodes().filter(
             category=self.object
         )
+        context["category_rendered_description"] = get_rendered_content(
+            self.object.description
+        )
         return context
 
     def get_breadcrumb_name(self):

diff --git a/src/open_inwoner/templates/pages/category/detail.html b/src/open_inwoner/templates/pages/category/detail.html
@@ -17,7 +17,7 @@ <h1 class="h1">
                 {% button icon="edit" text=_("Open in admin") hide_text=True href="admin:pdc_category_change" object_id=object.pk %}
             {% endif %}
         </h1>
-				{{ object.description|category_ckeditor_content|safe }}
+            {{ category_rendered_description|safe }}
 
         {% if subcategories %}
             {% card_container subcategories=subcategories parent_category=object %}

diff --git a/src/open_inwoner/utils/ckeditor.py b/src/open_inwoner/utils/ckeditor.py
@@ -21,7 +21,7 @@
 ]
 
 
-def get_rendered_content(content):
+def get_rendered_content(content: str) -> str:
     """
     Takes object's content as an input and returns the rendered one.
     """
@@ -37,7 +37,7 @@ def get_rendered_content(content):
             if element.name == "a" and element.attrs.get("href", "").startswith("http"):
                 element.attrs["target"] = "_blank"
 
-    return soup
+    return str(soup)
 
 
 def get_product_rendered_content(product):