Include cache_suffix tinymce parameter in project's static files

jazzband · Apr 17, 2024 · cf647d0 · cf647d0
1 parent eac5cc3
commit cf647d0
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 2 deletions.
diff --git a/tests/test_widgets.py b/tests/test_widgets.py
@@ -124,6 +124,22 @@ def test_tinymce_widget_media(self):
                 ],
             )
 
+    def test_widget_media_applied_cache_suffix(self):
+        tinymce_version = "6.8"
+
+        orig_config = tinymce.settings.DEFAULT_CONFIG
+        with patch.dict(tinymce.settings.DEFAULT_CONFIG, {**orig_config, "cache_suffix": f"?ver={tinymce_version}"}):
+            widget = TinyMCE()
+
+            self.assertEqual(list(widget.media.render_css()), [])
+            self.assertEqual(
+                widget.media.render_js(),
+                [
+                    f'<script src="/tinymce/compressor/?ver={tinymce_version}"></script>',
+                    f'<script src="/static/django_tinymce/init_tinymce.js?ver={tinymce_version}"></script>'
+                ]
+            )
+
     def test_tinymce_widget_required(self):
         """
         The TinyMCE widget should never output the required HTML attribute, even
@@ -142,7 +158,7 @@ def test_tinymce_widget_allow_translated_options(self):
         orig_config = tinymce.settings.DEFAULT_CONFIG
         style_formats = [{"title": gettext_lazy("Awesome style"), "inline": "strong"}]
         with patch.dict(
-            tinymce.settings.DEFAULT_CONFIG, {**orig_config, "style_formats": style_formats}
+                tinymce.settings.DEFAULT_CONFIG, {**orig_config, "style_formats": style_formats}
         ):
             html = widget.render("foobar", "lorem ipsum", attrs={"id": "id_foobar"})
             self.assertIn("Awesome style", html)
diff --git a/tinymce/widgets.py b/tinymce/widgets.py
@@ -16,7 +16,7 @@
 from django.core.serializers.json import DjangoJSONEncoder
 from django.forms.utils import flatatt
 from django.urls import reverse
-from django.utils.html import escape
+from django.utils.html import escape, format_html
 from django.utils.safestring import mark_safe
 from django.utils.translation import get_language, gettext as _, to_locale
 
@@ -114,6 +114,18 @@ def _media(self):
 
     media = property(_media)
 
+    def _render_js(self):
+        revision_parameter = tinymce.settings.DEFAULT_CONFIG.get('cache_suffix', '')
+
+        return [
+            format_html(
+                '<script src="{}{}"></script>',
+                (self.absolute_path(path)), revision_parameter)
+            for path in self._js
+        ]
+
+    forms.widgets.Media.render_js = _render_js
+
 
 class AdminTinyMCE(TinyMCE, admin_widgets.AdminTextareaWidget):
     pass