Return tuples instead of rendering in all bundled content types

matthiask · matthiask · commit 0217a59e77f2 · 2022-01-07T16:19:11.000+01:00
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -8,6 +8,12 @@ Change log
 
 - Added pre-commit.
 - Dropped compatibility guarantees with Python < 3.6, Django < 3.2.
+- Changed all bundled content types' ``render()`` methods to return the
+  ``(template_name, context)`` tuple instead of rendering content themselves.
+- The default view was changed to accept the path as a ``path`` keyword
+  argument, not only as a positional argument.
+- Changed the item editor action buttons CSS to not use transitions so that the
+  sprite buttons look as they should.
 
 
 `v1.20.0`_ (2021-03-22)
diff --git a/feincms/_internal.py b/feincms/_internal.py
@@ -5,9 +5,6 @@
 """
 
 
-from django.template.loader import render_to_string
-
-
 __all__ = ("monkeypatch_method", "monkeypatch_property")
 
 
@@ -41,7 +38,3 @@ def decorator(func):
         return func
 
     return decorator
-
-
-def ct_render_to_string(template, ctx, **kwargs):
-    return render_to_string(template, ctx, request=kwargs.get("request"))
diff --git a/feincms/content/contactform/models.py b/feincms/content/contactform/models.py
@@ -13,8 +13,6 @@
 from django.template.loader import render_to_string
 from django.utils.translation import gettext_lazy as _
 
-from feincms._internal import ct_render_to_string
-
 
 class ContactForm(forms.Form):
     name = forms.CharField(label=_("name"))
@@ -42,7 +40,7 @@ def initialize_type(cls, form=None):
 
     def process(self, request, **kwargs):
         if request.GET.get("_cf_thanks"):
-            self.rendered_output = ct_render_to_string(
+            self.rendered_output = render_to_string(
                 "content/contactform/thanks.html", {"content": self}, request=request
             )
             return
@@ -70,7 +68,7 @@ def process(self, request, **kwargs):
 
             form = self.form(initial=initial)
 
-        self.rendered_output = ct_render_to_string(
+        self.rendered_output = render_to_string(
             "content/contactform/form.html",
             {"content": self, "form": form},
             request=request,
diff --git a/feincms/content/file/models.py b/feincms/content/file/models.py
@@ -10,7 +10,6 @@
 from django.utils.translation import gettext_lazy as _
 
 from feincms import settings
-from feincms._internal import ct_render_to_string
 
 
 class FileContent(models.Model):
@@ -30,9 +29,7 @@ class Meta:
         verbose_name_plural = _("files")
 
     def render(self, **kwargs):
-        return ct_render_to_string(
+        return (
             ["content/file/%s.html" % self.region, "content/file/default.html"],
             {"content": self},
-            request=kwargs.get("request"),
-            context=kwargs.get("context"),
         )
diff --git a/feincms/content/filer/models.py b/feincms/content/filer/models.py
@@ -3,7 +3,6 @@
 from django.db import models
 from django.utils.translation import gettext_lazy as _
 
-from feincms._internal import ct_render_to_string
 from feincms.admin.item_editor import FeinCMSInline
 
 
@@ -36,16 +35,14 @@ class Meta:
             abstract = True
 
         def render(self, **kwargs):
-            return ct_render_to_string(
+            return (
                 [
                     f"content/filer/{self.file_type}_{self.type}.html",
                     "content/filer/%s.html" % self.type,
                     "content/filer/%s.html" % self.file_type,
                     "content/filer/default.html",
                 ],
                 {"content": self},
-                request=kwargs.get("request"),
-                context=kwargs.get("context"),
             )
 
     class FilerFileContent(ContentWithFilerFile):
diff --git a/feincms/content/image/models.py b/feincms/content/image/models.py
@@ -10,7 +10,6 @@
 from django.utils.translation import gettext_lazy as _
 
 from feincms import settings
-from feincms._internal import ct_render_to_string
 from feincms.templatetags import feincms_thumbnail
 
 
@@ -64,11 +63,9 @@ def render(self, **kwargs):
         if hasattr(self, "position"):
             templates.insert(0, "content/image/%s.html" % self.position)
 
-        return ct_render_to_string(
+        return (
             templates,
             {"content": self},
-            request=kwargs.get("request"),
-            context=kwargs.get("context"),
         )
 
     def get_image(self):
diff --git a/feincms/content/richtext/models.py b/feincms/content/richtext/models.py
@@ -2,7 +2,6 @@
 from django.utils.translation import gettext_lazy as _
 
 from feincms import settings
-from feincms._internal import ct_render_to_string
 from feincms.contrib.richtext import RichTextField
 
 
@@ -30,11 +29,9 @@ class Meta:
         verbose_name_plural = _("rich texts")
 
     def render(self, **kwargs):
-        return ct_render_to_string(
+        return (
             "content/richtext/default.html",
             {"content": self},
-            request=kwargs.get("request"),
-            context=kwargs.get("context"),
         )
 
     @classmethod
diff --git a/feincms/content/section/models.py b/feincms/content/section/models.py
@@ -5,7 +5,6 @@
 from django.utils.translation import gettext_lazy as _
 
 from feincms import settings
-from feincms._internal import ct_render_to_string
 from feincms.admin.item_editor import FeinCMSInline
 from feincms.contrib.richtext import RichTextField
 from feincms.module.medialibrary.fields import MediaFileForeignKey
@@ -81,16 +80,14 @@ def render(self, **kwargs):
         else:
             mediafile_type = "nomedia"
 
-        return ct_render_to_string(
+        return (
             [
                 f"content/section/{mediafile_type}_{self.type}.html",
                 "content/section/%s.html" % mediafile_type,
                 "content/section/%s.html" % self.type,
                 "content/section/default.html",
             ],
             {"content": self},
-            request=kwargs.get("request"),
-            context=kwargs.get("context"),
         )
 
     def save(self, *args, **kwargs):
diff --git a/feincms/content/template/models.py b/feincms/content/template/models.py
@@ -1,7 +1,6 @@
 from django.db import models
 from django.utils.translation import gettext_lazy as _
 
-from feincms._internal import ct_render_to_string
 from feincms.content.raw.models import RawContent  # noqa
 from feincms.content.richtext.models import RichTextContent  # noqa
 
@@ -31,9 +30,7 @@ def initialize_type(cls, TEMPLATES):
         )
 
     def render(self, **kwargs):
-        return ct_render_to_string(
+        return (
             self.template,
             {"content": self},
-            request=kwargs.get("request"),
-            context=kwargs.get("context"),
         )
diff --git a/feincms/content/video/models.py b/feincms/content/video/models.py
@@ -3,8 +3,6 @@
 from django.db import models
 from django.utils.translation import gettext_lazy as _
 
-from feincms._internal import ct_render_to_string
-
 
 class VideoContent(models.Model):
     """
@@ -71,9 +69,7 @@ def ctx_for_video(self, vurl):
 
     def render(self, **kwargs):
         ctx = self.ctx_for_video(self.video)
-        return ct_render_to_string(
+        return (
             self.get_templates(ctx["portal"]),
             ctx,
-            request=kwargs.get("request"),
-            context=kwargs.get("context"),
         )
diff --git a/feincms/module/medialibrary/contents.py b/feincms/module/medialibrary/contents.py
@@ -3,7 +3,6 @@
 from django.db import models
 from django.utils.translation import gettext_lazy as _
 
-from feincms._internal import ct_render_to_string
 from feincms.admin.item_editor import FeinCMSInline
 from feincms.module.medialibrary.fields import ContentWithMediaFile
 
@@ -63,14 +62,12 @@ def initialize_type(cls, TYPE_CHOICES=None):
         )
 
     def render(self, **kwargs):
-        return ct_render_to_string(
+        return (
             [
                 f"content/mediafile/{self.mediafile.type}_{self.type}.html",
                 "content/mediafile/%s.html" % self.mediafile.type,
                 "content/mediafile/%s.html" % self.type,
                 "content/mediafile/default.html",
             ],
             {"content": self},
-            request=kwargs.get("request"),
-            context=kwargs.get("context"),
         )
diff --git a/tests/testapp/tests/test_page.py b/tests/testapp/tests/test_page.py
@@ -22,7 +22,7 @@
 
 from feincms import settings as feincms_settings
 from feincms.content.application.models import app_reverse
-from feincms.contents import RawContent, RichTextContent
+from feincms.contents import RawContent
 from feincms.context_processors import add_page_if_missing
 from feincms.models import ContentProxy
 from feincms.module.medialibrary.models import Category, MediaFile
@@ -592,19 +592,6 @@ def test_13_inheritance_and_ct_tracker(self):
 
         self.assertNotEqual(page2._ct_inventory, {})
 
-    def test_14_richtext(self):
-        # only create the content type to test the item editor
-        # customization hooks
-        tmp = Page._feincms_content_types[:]
-        type = Page.create_content_type(RichTextContent, regions=("notexists",))
-        Page._feincms_content_types = tmp
-
-        from django.utils.safestring import SafeData
-
-        obj = type()
-        obj.text = "Something"
-        self.assertTrue(isinstance(obj.render(), SafeData))
-
     def test_17_page_template_tags(self):
         self.create_default_page_set()
 
