fix: preserve view_class in decorated views

Will-Hoey · marksweb · commit f8499b24e848 · 2023-10-17T10:36:11.000+01:00
- set `view_class` attr on inner
- update regression test to always check for "ClassBasedView"
diff --git a/cms/tests/test_apphooks.py b/cms/tests/test_apphooks.py
@@ -26,7 +26,7 @@
 from cms.test_utils.testcases import CMSTestCase
 from cms.tests.test_menu_utils import DumbPageLanguageUrl
 from cms.toolbar.toolbar import CMSToolbar
-from cms.utils.compat import DJANGO_2_2, DJANGO_3
+from cms.utils.compat import DJANGO_2_2, DJANGO_3, DJANGO_4_1
 from cms.utils.conf import get_cms_setting
 from cms.utils.urlutils import admin_reverse
 from menus.menu_pool import menu_pool
@@ -307,7 +307,7 @@ def test_apphook_permissions_preserves_view_name(self):
         view_names = (
             ('sample-settings', 'sample_view'),
             ('sample-class-view', 'ClassView'),
-            ('sample-class-based-view', 'view' if not (DJANGO_3 or DJANGO_2_2) else 'ClassBasedView' ),
+            ('sample-class-based-view', 'ClassBasedView' ),
         )
 
         with force_language("en"):
diff --git a/cms/utils/decorators.py b/cms/utils/decorators.py
@@ -20,6 +20,8 @@ def inner(request, *args, **kwargs):
         return func(request, *args, **kwargs)
     inner.__module__ = func.__module__
     inner.__doc__ = func.__doc__
+    if hasattr(func, "view_class"):
+        inner.view_class = func.view_class
     if hasattr(func, '__name__'):
         inner.__name__ = func.__name__
     elif hasattr(func, '__class__'):
