diff --git a/cms/cms_toolbars.py b/cms/cms_toolbars.py index 728db883b30..6c04b0de71a 100644 --- a/cms/cms_toolbars.py +++ b/cms/cms_toolbars.py @@ -16,7 +16,7 @@ from cms.toolbar_base import CMSToolbar from cms.toolbar_pool import toolbar_pool from cms.utils import get_language_from_request, page_permissions -from cms.utils.compat import DJANGO_5_0 +from cms.utils.compat import DJANGO_4_2 from cms.utils.conf import get_cms_setting from cms.utils.i18n import get_language_dict, get_language_tuple from cms.utils.page_permissions import user_can_change_page, user_can_delete_page, user_can_publish_page @@ -226,7 +226,7 @@ def add_logout_button(self, parent): action=admin_reverse('logout'), active=True, on_success=on_success, - method='GET' if not DJANGO_5_0 else 'POST', + method='GET' if DJANGO_4_2 else 'POST', ) def add_language_menu(self): diff --git a/cms/tests/test_toolbar.py b/cms/tests/test_toolbar.py index ad506949a85..5f40b9454d9 100644 --- a/cms/tests/test_toolbar.py +++ b/cms/tests/test_toolbar.py @@ -40,7 +40,7 @@ from cms.toolbar.items import AjaxItem, Break, ItemSearchResult, LinkItem, SubMenu, ToolbarAPIMixin from cms.toolbar.toolbar import CMSToolbar from cms.toolbar_pool import toolbar_pool -from cms.utils.compat import DJANGO_4_2, DJANGO_5_0 +from cms.utils.compat import DJANGO_4_2 from cms.utils.conf import get_cms_setting from cms.utils.i18n import get_language_tuple from cms.utils.urlutils import admin_reverse @@ -641,10 +641,10 @@ def test_hide_toolbar_login_nonstaff(self): def test_admin_logout_staff(self): with override_settings(CMS_PERMISSION=True): with self.login_user_context(self.get_staff()): - if DJANGO_5_0: - response = self.client.post('/en/admin/logout/') - else: + if DJANGO_4_2: response = self.client.get('/en/admin/logout/') + else: + response = self.client.post('/en/admin/logout/') self.assertEqual(response.status_code, 200) def test_show_toolbar_without_edit(self): diff --git a/cms/utils/compat/__init__.py b/cms/utils/compat/__init__.py index 085512f83b6..8a07cc79ada 100644 --- a/cms/utils/compat/__init__.py +++ b/cms/utils/compat/__init__.py @@ -10,8 +10,7 @@ DJANGO_2_2 = Version(DJANGO_VERSION) < Version('3.0') DJANGO_3_0 = Version(DJANGO_VERSION) < Version('3.1') DJANGO_3_1 = Version(DJANGO_VERSION) < Version('3.2') -DJANGO_3_2 = Version(DJANGO_VERSION) < Version('3.3') -DJANGO_3 = Version(DJANGO_VERSION) < Version('4.0') +DJANGO_3_2 = Version(DJANGO_VERSION) < Version('4.0') +DJANGO_3 = DJANGO_3_2 DJANGO_4_1 = Version(DJANGO_VERSION) < Version('4.2') DJANGO_4_2 = Version(DJANGO_VERSION) < Version('4.3') -DJANGO_5_0 = Version(DJANGO_VERSION) < Version('5.1')