django-cms · jrief · Apr 24, 2018 · Apr 25, 2018 · May 2, 2018 · May 9, 2018
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -9,6 +9,7 @@
 * Added ``page_title`` parameter for ``cms.api.create_page()`` and ``cms.api.create_title()``.
 * Introduced Django 2.0 support.
 * Introduced Django 2.1 support.
+* Fixed rendering of permission icons. Use SVG variants instead of GIFs.
 
 
 === 3.5.3 (2018-11-20) ===

diff --git a/cms/templatetags/cms_admin.py b/cms/templatetags/cms_admin.py
@@ -6,6 +6,7 @@
 from classytags.helpers import InclusionTag
 from cms.constants import PUBLISHER_STATE_PENDING
 
+from django import VERSION as DJANGO_VERSION
 from django import template
 from django.conf import settings
 from django.contrib.admin.views.main import ERROR_FLAG
@@ -129,8 +130,10 @@ def choices():
 @register.filter
 def boolean_icon(value):
     BOOLEAN_MAPPING = {True: 'yes', False: 'no', None: 'unknown'}
+    EXTENSION = 'gif' if DJANGO_VERSION < (1, 9) else 'svg'
     return mark_safe(
-        '<img src="%sicon-%s.gif" alt="%s" />' % (CMS_ADMIN_ICON_BASE, BOOLEAN_MAPPING.get(value, 'unknown'), value))
+        '<img src="%sicon-%s.%s" alt="%s" />' % (CMS_ADMIN_ICON_BASE, BOOLEAN_MAPPING.get(value, 'unknown'), EXTENSION,
+                                                 value))
 
 
 @register.filter

diff --git a/cms/tests/test_page.py b/cms/tests/test_page.py
@@ -1049,6 +1049,40 @@ def test_xframe_options_with_cms_page_cache_and_clickjacking_middleware(self):
             resp = self.client.get(page.get_absolute_url('en'))
             self.assertEqual(resp.get('X-Frame-Options'), None)
 
+    def test_xframe_options_with_cms_page_cache_and_clickjacking_middleware(self):
+        # Refs: 6346
+        if getattr(settings, 'MIDDLEWARE', None):
+            override = {
+                'MIDDLEWARE': settings.MIDDLEWARE + [
+                    'django.middleware.clickjacking.XFrameOptionsMiddleware',
+                ]
+            }
+        else:
+            override = {
+                'MIDDLEWARE_CLASSES': settings.MIDDLEWARE_CLASSES + [
+                    'django.middleware.clickjacking.XFrameOptionsMiddleware',
+                ]
+            }
+
+        override['CMS_PAGE_CACHE'] = True
+
+        with self.settings(**override):
+            page = create_page(
+                'test page 1',
+                'nav_playground.html',
+                'en',
+                published=True,
+                xframe_options=Page.X_FRAME_OPTIONS_ALLOW,
+            )
+
+            # Normal response from render_page
+            resp = self.client.get(page.get_absolute_url('en'))
+            self.assertEqual(resp.get('X-Frame-Options'), None)
+
+            # Response from page cache
+            resp = self.client.get(page.get_absolute_url('en'))
+            self.assertEqual(resp.get('X-Frame-Options'), None)
+
     def test_page_used_on_request(self):
         """
         The rendered page changes depending on request and