Your funding directly benefits the product, mainly through the @@ -50,10 +50,10 @@
The django CMS Association is a non-profit organisation that funds and steers the development of @@ -63,10 +63,10 @@
en default body 1
'}, + 'plugin_type': 'TextPlugin', + 'values': {'body': 'en default body 1
'}, }, { - 'plugin_type':'TextPlugin', - 'values':{'body':'en default body 2
'}, + 'plugin_type': 'TextPlugin', + 'values': {'body': 'en default body 2
'}, }, ] }, @@ -1376,6 +1376,10 @@ def test_delete(self): .values_list('pk', flat=True) ) + new_tree = self.get_plugins().values_list('pk', 'position') + expected = [(pk, pos) for pos, pk in enumerate(plugin_tree_all, 1)] + self.assertSequenceEqual(new_tree, expected) + for plugin in self.get_plugins().filter(parent__isnull=True): for plugin_id in [plugin.pk] + tree[plugin.pk]: plugin_tree_all.remove(plugin_id) diff --git a/cms/tests/test_plugins.py b/cms/tests/test_plugins.py index e26f73f0105..c5f7d69e3c0 100644 --- a/cms/tests/test_plugins.py +++ b/cms/tests/test_plugins.py @@ -51,7 +51,7 @@ ) from cms.test_utils.testcases import CMSTestCase from cms.toolbar.toolbar import CMSToolbar -from cms.toolbar.utils import get_object_edit_url, get_toolbar_from_request +from cms.toolbar.utils import get_object_edit_url from cms.utils.plugins import copy_plugins_to_placeholder, get_plugins diff --git a/cms/tests/test_templatetags.py b/cms/tests/test_templatetags.py index f2f2806b102..711f3274d42 100644 --- a/cms/tests/test_templatetags.py +++ b/cms/tests/test_templatetags.py @@ -57,7 +57,6 @@ def test_get_preview_url(self): self.assertIn("/en", page_preview_url) self.assertIn("/de/", german_content_preview_url) - def test_get_admin_tree_title(self): page = create_page("page_a", "nav_playground.html", "en") self.assertEqual(get_page_display_name(page), 'page_a') diff --git a/cms/tests/test_views.py b/cms/tests/test_views.py index 745c482aa1d..42055b2b140 100644 --- a/cms/tests/test_views.py +++ b/cms/tests/test_views.py @@ -12,7 +12,6 @@ from django.urls import clear_url_caches, reverse from django.utils.translation import override as force_language -from cms import api from cms.api import create_page, create_page_content from cms.middleware.toolbar import ToolbarMiddleware from cms.models import PageContent, PagePermission, Placeholder, UserSettings @@ -432,6 +431,7 @@ def test_context_current_page(self): template = Variable('CMS_TEMPLATE').resolve(response.context) self.assertEqual(template, page_template) + class EndpointTests(CMSTestCase): def setUp(self) -> None: @@ -463,7 +463,7 @@ def test_render_object_structure_i18n(self): self._add_plugin_to_placeholder(placeholder, "TextPlugin", language="fr") with force_language("fr"): setting, _ = UserSettings.objects.get_or_create(user=self.get_superuser()) - setting.language="fr" + setting.language = "fr" setting.save() structure_endpoint_url = admin_reverse( "cms_placeholder_render_object_structure", diff --git a/cms/toolbar/utils.py b/cms/toolbar/utils.py index b1be7f77e8b..358aa234fe6 100644 --- a/cms/toolbar/utils.py +++ b/cms/toolbar/utils.py @@ -14,7 +14,6 @@ ) from cms.constants import PLACEHOLDER_TOOLBAR_JS, PLUGIN_TOOLBAR_JS -from cms.models import PageContent from cms.utils import get_language_list from cms.utils.conf import get_cms_setting from cms.utils.urlutils import admin_reverse @@ -170,7 +169,7 @@ def get_object_edit_url(obj: models.Model, language: str = None) -> str: return url -def get_object_preview_url(obj:models.Model, language: str = None) -> str: +def get_object_preview_url(obj: models.Model, language: str = None) -> str: """ Returns the url of the preview endpoint for the given object. The object must be frontend-editable and registered as such with cms. @@ -207,6 +206,7 @@ def get_object_structure_url(obj: models.Model, language: str = None) -> str: with force_language(language): return admin_reverse('cms_placeholder_render_object_structure', args=[content_type.pk, obj.pk]) + def get_object_for_language(obj: models.Model, language: str, latest: bool = False) -> Optional[models.Model]: """ Retrieves the correct content object for the target language. The object must be frontend-editable diff --git a/cms/utils/permissions.py b/cms/utils/permissions.py index b4a6e0a3ebe..04c17a73d43 100644 --- a/cms/utils/permissions.py +++ b/cms/utils/permissions.py @@ -10,7 +10,7 @@ from cms.constants import ROOT_USER_LEVEL, SCRIPT_USERNAME from cms.exceptions import NoPermissionsException -from cms.models import GlobalPagePermission, Page, PagePermission +from cms.models import GlobalPagePermission, PagePermission from cms.utils.compat.dj import available_attrs from cms.utils.conf import get_cms_setting from cms.utils.page import get_clean_username diff --git a/cms/views.py b/cms/views.py index 4b37d7340d0..f16736293ae 100644 --- a/cms/views.py +++ b/cms/views.py @@ -94,7 +94,6 @@ def details(request, slug): # Get a Page model object from the request site = get_current_site() page = get_page_from_request(request, use_path=slug) - toolbar = get_toolbar_from_request(request) tree_nodes = TreeNode.objects.get_for_site(site) if not page and not slug and not tree_nodes.exists():