Fixed django-cms#5900 -- Don't assume a published page has public translation (django-cms#5908)

Author: czpython

CHANGELOG.txt

@@ -15,6 +15,8 @@
 * Fixed an IntegrityError raised when publishing a page with no public version and whose publisher
   state is pending.
 * Fixed an issue with JS not being able to determine correct path to async bundle
+* Fixed a ``DoesNotExist`` db error raised when moving a page marked as published but whose public
+  translation does not exist.
 
 
 === 3.4.3 (2017-04-24) ===

cms/models/pagemodel.py

@@ -819,9 +819,11 @@ def unpublish(self, language):
         return True
 
     def mark_as_pending(self, language):
+        assert self.publisher_is_draft
+
         public = self.get_public_object()
 
-        if public:
+        if public and public.get_title_obj(language, fallback=False):
             state = public.get_publisher_state(language)
             # keep the same state
             # only set the page as unpublished
@@ -831,25 +833,21 @@ def mark_as_pending(self, language):
                 published=False
             )
 
-        draft = self.get_draft_object()
-
-        if draft and draft.is_published(language) and draft.get_publisher_state(
-                language) == PUBLISHER_STATE_DEFAULT:
+        if self.is_published(language) and self.get_publisher_state(language) == PUBLISHER_STATE_DEFAULT:
             # Only change the state if the draft page is published
             # and it's state is the default (0)
-            draft.set_publisher_state(language, state=PUBLISHER_STATE_PENDING)
+            self.set_publisher_state(language, state=PUBLISHER_STATE_PENDING)
 
     def mark_descendants_pending(self, language):
         assert self.publisher_is_draft
 
-        # Go through all children of our public instance
-        public_page = self.publisher_public
-
-        if public_page:
-            descendants = public_page.get_descendants().filter(title_set__language=language)
+        descendants = self.get_descendants().filter(
+            publisher_public__isnull=False,
+            title_set__language=language,
+        )
 
-            for child in descendants:
-                child.mark_as_pending(language)
+        for child in descendants.iterator():
+            child.mark_as_pending(language)
 
     def mark_as_published(self, language):
         from cms.models import Title

cms/models/titlemodels.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from datetime import timedelta
-
 from django.db import models
 from django.utils import timezone
 from django.utils.encoding import python_2_unicode_compatible
@@ -91,11 +89,6 @@ def save_base(self, *args, **kwargs):
         """
         keep_state = getattr(self, '_publisher_keep_state', None)
 
-        # Published pages should always have a publication date
-        # if the page is published we set the publish date if not set yet.
-        if self.page.publication_date is None and self.published:
-            self.page.publication_date = timezone.now() - timedelta(seconds=5)
-
         if self.publisher_is_draft and not keep_state and self.is_new_dirty():
             self.publisher_state = PUBLISHER_STATE_DIRTY
 
@@ -128,11 +121,8 @@ def is_new_dirty(self):
 
 
 class EmptyTitle(object):
-
-    def __init__(self, language):
-        self.language = language
-
-    """Empty title object, can be returned from Page.get_title_obj() if required
+    """
+    Empty title object, can be returned from Page.get_title_obj() if required
     title object doesn't exists.
     """
     title = ""
@@ -146,6 +136,17 @@ def __init__(self, language):
     page_title = ""
     published = False
 
+    def __init__(self, language):
+        self.language = language
+
+    def __nonzero__(self):
+        # Python 2 compatibility
+        return False
+
+    def __bool__(self):
+        # Python 3 compatibility
+        return False
+
     @property
     def overwrite_url(self):
         return None

cms/tests/test_page_admin.py

@@ -16,7 +16,11 @@
 from cms.admin.forms import AdvancedSettingsForm
 from cms.admin.pageadmin import PageAdmin
 from cms.api import create_page, add_plugin, create_title
-from cms.constants import PUBLISHER_STATE_DEFAULT, PUBLISHER_STATE_PENDING, PUBLISHER_STATE_DIRTY
+from cms.constants import (
+    PUBLISHER_STATE_DEFAULT,
+    PUBLISHER_STATE_DIRTY,
+    PUBLISHER_STATE_PENDING,
+)
 from cms.middleware.user import CurrentUserMiddleware
 from cms.models.pagemodel import Page
 from cms.models.permissionmodels import PagePermission
@@ -798,6 +802,86 @@ def test_publish_with_pending_unpublished_descendants(self):
                 PUBLISHER_STATE_DEFAULT
             )
 
+    def test_move_page_regression_5900(self):
+        # ref: https://github.com/divio/django-cms/issues/5900
+        superuser = self.get_superuser()
+        with self.login_user_context(superuser):
+            page_home = self.get_new_page_data()
+            self.client.post(URL_CMS_PAGE_ADD, page_home)
+
+            # Create parent page
+            page_root = create_page("Parent", 'col_three.html', "de", published=False)
+
+            # Create english translation
+            create_title(
+                "en",
+                "parent-en",
+                page=page_root,
+                slug="parent-en"
+            )
+
+            # Create child pages
+            page_child_1 = create_page(
+                "Child 1",
+                template=constants.TEMPLATE_INHERITANCE_MAGIC,
+                language="de",
+                parent=page_root,
+                published=False
+            )
+
+            # Create english translation
+            create_title(
+                "en",
+                "child-1-en",
+                page=page_child_1,
+                slug="child-1-en"
+            )
+
+            # Try to publish child english translation
+            publish_endpoint = self.get_admin_url(Page, 'publish_page', page_child_1.pk, 'en')
+
+            self.client.post(publish_endpoint)
+
+            self.assertEqual(
+                page_child_1.get_publisher_state("en"),
+                PUBLISHER_STATE_PENDING,
+            )
+
+            # Publish the german translations for both the parent and child pages.
+            # This will create the public versions for both.
+            page_root.publish('de')
+            page_child_1.publish('de')
+
+            # Move page_child_1 to the root
+            data = {
+                "id": page_child_1.pk,
+                "position": "2",
+            }
+
+            response = self.client.post(
+                URL_CMS_PAGE_MOVE % page_child_1.pk,
+                data,
+            )
+            self.assertEqual(response.status_code, 200)
+
+            # Ensure move worked
+            self.assertEqual(page_root.reload().get_descendants().count(), 0)
+
+            # Move page_child_1 under its old parent
+            # page_child_1 does not have a public version of its english translation
+            data = {
+                "id": page_child_1.pk,
+                "target": page_root.pk,
+                "position": "0",
+            }
+            response = self.client.post(
+                URL_CMS_PAGE_MOVE % page_child_1.pk,
+                data,
+            )
+            self.assertEqual(response.status_code, 200)
+
+            # Ensure move worked
+            self.assertEqual(page_root.reload().get_descendants().count(), 1)
 
     def test_edit_page_other_site_and_language(self):
         """

cms/tests/test_publisher.py

@@ -579,7 +579,7 @@ def test_delete_title_unpublish(self):
         page = self.create_page('test', published=True)
         sub_page = self.create_page('test2', published=True, parent=page)
         self.assertTrue(sub_page.publisher_public.is_published('en'))
-        page.title_set.all().delete()
+        page.reload().title_set.all().delete()
         self.assertFalse(sub_page.publisher_public.is_published('en', force_reload=True))
 
     def test_modify_child_while_pending(self):
@@ -686,9 +686,14 @@ def test_republish_with_unpublished_child(self):
         self.assertFalse(gc1.publisher_public_id)
         self.assertTrue(gc1.is_published('en'))
         self.assertTrue(gc2.is_published('en'))
+
+        home = self.reload(home)
         home.unpublish('en')
+
         unpub1 = self.reload(unpub1)
+        unpub2 = self.reload(unpub2)
         unpub2.unpublish('en')  # Just marks this as not published
+
         for page in (unpub1, unpub2):
             self.assertFalse(page.is_published('en'), page)
             self.assertEqual(page.get_publisher_state("en"), PUBLISHER_STATE_DIRTY)
@@ -770,7 +775,7 @@ def test_unpublish_with_dirty_descendants(self):
         self.assertTrue(child.publisher_public.is_published('en'))
         self.assertTrue(gchild.publisher_public.is_published('en'))
 
-        page.unpublish('en')
+        page.reload().unpublish('en')
         child = self.reload(child)
         gchild = self.reload(gchild)
         # Descendants become dirty after unpublish