Merge 35eac8a into aee76b4

Author: fsbraun

CHANGELOG.rst

@@ -4,6 +4,8 @@
 Features:
 ---------
 
+* Fixed a bug where menu link is outdated when page moved (#7558)
+* Fixed a bug where the preview button lead to the wrong languge (#7558)
 * Graceful plugin exceptions (#7423)
 * Reintroduce indicator menus (#7426)
 * Add release scripts for develop-4 branch (#7466)

cms/models/pagemodel.py

@@ -438,7 +438,7 @@ def move_page(self, target_node, position='first-child'):
             if not self.is_home:
                 self._update_url_path(language)
             self._update_url_path_recursive(language)
-        self.clear_cache()
+        self.clear_cache(menu=True)
         return self
 
     def _clear_placeholders(self, language):
@@ -921,7 +921,7 @@ def get_fallback_language(page, language):
         for page_content in cached_page_content:
             self.page_content_cache[page_content.language] = page_content
 
-        # Reload if explicitly needed or language not in title cache
+        # Reload if explicitly needed or language not in content cache
         if force_reload or language not in self.page_content_cache:
             for page_content in self.pagecontent_set.all():
                 self.page_content_cache[page_content.language] = page_content

cms/templatetags/cms_admin.py

@@ -11,8 +11,10 @@
 from django.utils.translation import get_language
 from django.utils.translation import gettext_lazy as _
 
+from cms.models import Page
 from cms.models.contentmodels import PageContent
-from cms.utils import i18n
+from cms.toolbar.utils import get_object_preview_url
+from cms.utils import get_language_from_request, i18n
 from cms.utils.urlutils import admin_reverse
 
 register = template.Library()
@@ -56,16 +58,14 @@ class GetPreviewUrl(AsTag):
     )
 
     def get_value(self, context, page_content):
+        if isinstance(page_content, Page):
+            # Advanced settings wants a preview for a Page object.
+            page_content = page_content.get_content_obj(
+                language=get_language_from_request(context["request"])
+            )
         if not page_content:
             return ""
-        if GetPreviewUrl.page_content_type is None:
-            # Use class as cache
-            from django.contrib.contenttypes.models import ContentType
-
-            GetPreviewUrl.page_content_type = ContentType.objects.get_for_model(PageContent).pk
-
-        return admin_reverse('cms_placeholder_render_object_preview',
-                             args=[GetPreviewUrl.page_content_type, page_content.pk])
+        return get_object_preview_url(page_content, language=page_content.language)
 
 
 register.tag(GetPreviewUrl.name, GetPreviewUrl)

cms/tests/test_menu.py

@@ -301,6 +301,40 @@ def test_basic_cms_menu(self):
             [page.get_absolute_url() for page in pages],
         )
 
+    def test_show_page_in_menu_after_move_page(self):
+        """
+        Test checks if the menu cache is cleaned after move page.
+        """
+        page = create_page('page to move', 'nav_playground.html', 'en')
+
+        request = self.get_request('/')
+        renderer = menu_pool.get_renderer(request)
+        renderer.draft_mode_active = True
+        nodes_before = renderer.get_nodes()
+        index_before = [i for i, s in enumerate(nodes_before) if s.title == page.get_title()]
+        self.assertEqual(CacheKey.objects.count(), 1)
+
+        with self.login_user_context(self.get_superuser()):
+            # Moves the page to the second position in the tree
+            data = {'id': page.pk, 'position': 1}
+            endpoint = self.get_admin_url(Page, 'move_page', page.pk)
+            response = self.client.post(endpoint, data)
+            self.assertEqual(response.status_code, 200)
+            self.assertEqual(CacheKey.objects.count(), 0)
+
+        request = self.get_request('/')
+        renderer = menu_pool.get_renderer(request)
+        renderer.draft_mode_active = True
+        nodes_after = renderer.get_nodes()
+        index_after = [i for i, s in enumerate(nodes_after) if s.title == page.get_title()]
+
+        self.assertEqual(CacheKey.objects.count(), 1)
+        self.assertNotEqual(
+            index_before,
+            index_after,
+            'Index should not be the same after move page in navigation'
+        )
+
     def test_cms_menu_public_with_multiple_languages(self):
         pages = self.get_all_pages().order_by('node__path')
 

cms/tests/test_page_admin.py

@@ -1284,6 +1284,20 @@ def test_advanced_settings_form_apphook_config(self):
             del sys.modules['cms.test_utils.project.sampleapp.cms_apps']
         self.apphook_clear()
 
+    def test_advanced_settings_view_on_site(self):
+        """Advanced Page Settings `View on Site` object tool links to the Page's current language
+        content preview url"""
+        from cms.toolbar.utils import get_object_preview_url
+        superuser = self.get_superuser()
+        cms_page = create_page('app', 'nav_playground.html', 'en')
+        cms_page_content = cms_page.get_content_obj(language='en')
+        endpoint = self.get_admin_url(Page, 'advanced', cms_page.pk)
+
+        with self.login_user_context(superuser):
+            response = self.client.get(endpoint)
+
+        self.assertContains(response, get_object_preview_url(cms_page_content, language="en"))
+
     def test_form_url_page_change(self):
         superuser = self.get_superuser()
         with self.login_user_context(superuser):

cms/tests/test_templatetags.py

@@ -27,7 +27,7 @@
     PageUrl,
     Placeholder,
 )
-from cms.templatetags.cms_admin import get_page_display_name
+from cms.templatetags.cms_admin import GetPreviewUrl, get_page_display_name
 from cms.templatetags.cms_js_tags import json_filter
 from cms.templatetags.cms_tags import (
     _get_page_by_untyped_arg,
@@ -44,6 +44,20 @@
 
 class TemplatetagTests(CMSTestCase):
 
+    def test_get_preview_url(self):
+        """The get_preview_url template tag returns the content preview url for its language:
+        If a page is given, take the current language (en), if a page_content is given,
+        take its language (de for this test)"""
+        page = create_page("page_a", "nav_playground.html", "en")
+        german_content = create_page_content("de", "Seite_a", page)
+
+        page_preview_url = GetPreviewUrl.get_value(None, context={"request": None}, page_content=page)
+        german_content_preview_url = GetPreviewUrl.get_value(None, context={}, page_content=german_content)
+
+        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')