Fixed #6585 -- Added missing clear cache for menu when page is created (#6584)

vthaian · web-flow · commit 41a8404032f4 · 2019-01-14T08:02:04.000+01:00
diff --git a/cms/admin/forms.py b/cms/admin/forms.py
@@ -294,6 +294,8 @@ def save(self, *args, **kwargs):
             # its the first page. publish it right away
             new_page.publish(translation.language)
             new_page.set_as_homepage(self._user)
+
+        new_page.clear_cache(menu=True)
         return new_page
 
 
diff --git a/cms/tests/test_menu.py b/cms/tests/test_menu.py
@@ -17,12 +17,12 @@
 
 from cms.api import create_page, create_title
 from cms.cms_menus import get_visible_nodes
-from cms.models import Page, ACCESS_PAGE_AND_DESCENDANTS
+from cms.models import Page, ACCESS_PAGE_AND_DESCENDANTS, Title
 from cms.models.permissionmodels import GlobalPagePermission, PagePermission
 from cms.test_utils.project.sampleapp.cms_menus import SampleAppMenu, StaticMenu, StaticMenu2
 from cms.test_utils.fixtures.menus import (MenusFixture, SubMenusFixture,
                                            SoftrootFixture, ExtendedMenusFixture)
-from cms.test_utils.testcases import CMSTestCase
+from cms.test_utils.testcases import CMSTestCase, URL_CMS_PAGE_ADD, URL_CMS_PAGE
 from cms.test_utils.util.context_managers import apphooks, LanguageOverride
 from cms.test_utils.util.mock import AttributeObject
 from cms.utils import get_current_site
@@ -297,6 +297,35 @@ def test_basic_cms_menu(self):
             [page.get_absolute_url() for page in pages],
         )
 
+    def test_show_new_draft_page_in_menu(self):
+        """
+        Test checks if the menu cache is cleaned after create a new draft page.
+        """
+        with self.login_user_context(self.get_superuser()):
+            page_data_1 = self.get_new_page_data()
+            response = self.client.post(URL_CMS_PAGE_ADD, page_data_1)
+            self.assertRedirects(response, URL_CMS_PAGE)
+
+        request = self.get_request('/')
+        renderer = menu_pool.get_renderer(request)
+        renderer.draft_mode_active = True
+        renderer.get_nodes()
+        self.assertEqual(CacheKey.objects.count(), 1)
+
+        with self.login_user_context(self.get_superuser()):
+            page_data_2 = self.get_new_page_data()
+            self.assertNotEqual(page_data_1['slug'], page_data_2['slug'])
+            response = self.client.post(URL_CMS_PAGE_ADD, page_data_2)
+            self.assertRedirects(response, URL_CMS_PAGE)
+            page = Title.objects.drafts().get(slug=page_data_2['slug']).page
+
+        request = self.get_request('/')
+        renderer = menu_pool.get_renderer(request)
+        renderer.draft_mode_active = True
+        nodes = renderer.get_nodes()
+        self.assertEqual(CacheKey.objects.count(), 1)
+        self.assertEqual(page.get_title(), nodes[-1].title)
+
     def test_cms_menu_public_with_multiple_languages(self):
         for page in Page.objects.drafts():
             create_title(
