fix: admin

FidelityInternational · Oct 31, 2024 · f97d520 · f97d520
1 parent 6f39ea6
commit f97d520
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/djangocms_pageadmin/admin.py b/djangocms_pageadmin/admin.py
@@ -22,7 +22,6 @@
 from django.views.decorators.http import require_POST
 
 from cms.admin.pageadmin import PageContentAdmin as DefaultPageContentAdmin
-from cms.admin.utils import ChangeListActionsMixin
 from cms.extensions import extension_pool
 from cms.models import PageContent, PageUrl
 from cms.signals.apphook import set_restart_trigger
@@ -52,8 +51,14 @@
 
 require_POST = method_decorator(require_POST)
 
+PageContentAdminBases = [ VersioningAdminMixin, DefaultPageContentAdmin ]
 
-class PageContentAdmin(ChangeListActionsMixin, VersioningAdminMixin, DefaultPageContentAdmin):
+if CMS_41:
+    from cms.admin.utils import ChangeListActionsMixin
+    PageContentAdminBases.insert(0, ChangeListActionsMixin)
+
+
+class PageContentAdmin(*PageContentAdminBases):
     change_list_template = "admin/djangocms_pageadmin/pagecontent/change_list.html"
     list_display_links = None
     list_filter = (LanguageFilter, UnpublishedFilter, TemplateFilter, AuthorFilter)

diff --git a/tox.ini b/tox.ini
@@ -2,7 +2,7 @@
 envlist =
     flake8
     isort
-    py{38,39,310}-dj{32,42}-sqlite-cms40
+    py{39,310}-dj{32,42}-sqlite-cms40
 
 skip_missing_interpreters=True
 
@@ -11,11 +11,11 @@ deps =
     flake8: -r{toxinidir}/tests/requirements/requirements_base.txt
     isort: -r{toxinidir}/tests/requirements/requirements_base.txt
 
-    dj32: -r{toxinidir}/tests/requirements/dj32_cms40.txt
-    dj42: -r{toxinidir}/tests/requirements/dj42_cms40.txt
+    dj32-cms40: -r{toxinidir}/tests/requirements/dj32_cms40.txt
+    dj42-cms40: -r{toxinidir}/tests/requirements/dj42_cms40.txt
+    dj42-cms41: -r{toxinidir}/tests/requirements/dj42_cms41.txt
 
 basepython =
-    py38: python3.8
     py39: python3.9
     py310: python3.10