Merge pull request django-cms#4724 from yakky/merge/3.1.4.pre

Forwardport 3.1.x fixes

Author: mkoistinen

CHANGELOG.txt

@@ -61,6 +61,7 @@
 - Fix JS error when using PageSelectWidget
 - Fix whitespace markup issues in draft mode
 - Detect plugin migrations layout in tests
+- Fix some treebeard corruption issues
 
 
 === 3.1.3 (2015-09-01) ===
@@ -601,3 +602,4 @@ Please see Install/2.4 release notes *before* attempting to upgrade to version 2
 - home is now graphically designated in tree-view
 
 ==== 2.0.0 (2009-11-12) ====
+

cms/admin/permissionadmin.py

@@ -4,6 +4,7 @@
 from django.contrib.admin import site
 from django.contrib.auth import get_user_model, get_permission_codename
 from django.contrib.auth.admin import UserAdmin
+from django.db import OperationalError
 from django.utils.translation import ugettext as _
 
 from cms.admin.forms import GlobalPagePermissionAdminForm, PagePermissionInlineAdminForm, ViewRestrictionInlineAdminForm
@@ -37,9 +38,18 @@ class PagePermissionInlineAdmin(TabularInline):
     def raw_id_fields(cls):
         # Dynamically set raw_id_fields based on settings
         threshold = get_cms_setting('RAW_ID_USERS')
-        if threshold and get_user_model().objects.count() > threshold:
-            return ['user']
-        return []
+
+        # Given a fresh django-cms install and a django settings with the
+        # CMS_RAW_ID_USERS = CMS_PERMISSION = True
+        # django throws an OperationalError when running
+        # ./manage migrate
+        # because auth_user doesn't exists yet
+        try:
+            threshold = threshold and get_user_model().objects.count() > threshold
+        except OperationalError:
+            threshold = False
+
+        return ['user'] if threshold else []
 
     def get_queryset(self, request):
         """

cms/models/pagemodel.py

@@ -445,6 +445,12 @@ def copy_page(self, target, site, position='first-child',
         menu_pool.clear(site_id=site.pk)
         return first_page
 
+    def delete(self):
+        pages = [self.pk]
+        if self.publisher_public_id:
+            pages.append(self.publisher_public_id)
+        self.__class__.objects.filter(pk__in=pages).delete()
+
     def save(self, no_signals=False, commit=True, **kwargs):
         """
         Args:

cms/templates/cms/toolbar/plugin.html

@@ -1,4 +1,4 @@
-{% spaceless %}{% load i18n l10n sekizai_tags static cms_tags %}
+{% spaceless %}{% load i18n l10n sekizai_tags staticfiles cms_tags %}
 
 <div class="cms-plugin cms-plugin-{% if generic %}{{ generic.app_label }}-{{ generic.model_name }}-{% if attribute_name %}{{ attribute_name|slugify }}-{% endif %}{% endif %}{{ instance.pk|unlocalize }}{% if render_model_icon %} cms-render-model-icon{% elif render_model %} cms-render-model{% elif render_model_block %} cms-render-model cms-render-model-block{% elif render_model_add %} cms-render-model-add{% endif %}">{% endspaceless %}{% if content %}{{ content }}{% elif render_model_icon %}<img src="{% static 'cms/img/toolbar/render_model_placeholder.png' %}">{% elif render_model_add %}<img src="{% static 'cms/img/toolbar/render_model_placeholder.png' %}">{% else %}{{ rendered_content }}{% endif %}{% spaceless %}</div>
 

cms/tests/test_page.py

@@ -103,9 +103,12 @@ def test_treebeard_delete(self):
         page1 = create_page('home', 'nav_playground.html', 'en')
         page2 = create_page('page2', 'nav_playground.html', 'en', parent=page1)
         page3 = create_page('page3', 'nav_playground.html', 'en', parent=page2)
-        page1 = page1.reload()
-        page2 = page2.reload()
-        page3 = page3.reload()
+        page1.publish('en')
+        page2.publish('en')
+        page3.publish('en')
+        page1 = page1.reload().get_draft_object()
+        page2 = page2.reload().get_draft_object()
+        page3 = page3.reload().get_draft_object()
 
         self.assertEqual(page1.depth, 1)
         self.assertEqual(page1.numchild, 1)
@@ -120,16 +123,67 @@ def test_treebeard_delete(self):
         self.assertTrue(page3.is_leaf())
 
         page3.delete()
-        page1 = page1.reload()
-        page2 = page2.reload()
+        page1 = page1.reload().get_draft_object()
+        page2 = page2.reload().get_draft_object()
+
+        self.assertEqual(page2.depth, 2)
+        self.assertEqual(page2.numchild, 0)
+        self.assertTrue(page2.is_leaf())
+
+        page3 = create_page('page3', 'nav_playground.html', 'en', parent=page2, reverse_id='page3')
+        page1 = page1.reload().get_draft_object()
+        page2 = page2.reload().get_draft_object()
+        page3 = page3.reload().get_draft_object()
+
+        self.assertEqual(page2.depth, 2)
+        self.assertEqual(page2.numchild, 1)
+        self.assertFalse(page2.is_leaf())
+
+        self.assertEqual(page3.depth, 3)
+        self.assertEqual(page3.numchild, 0)
+        self.assertTrue(page3.is_leaf())
+
+        page1.publish('en')
+        page1 = page1.reload().get_draft_object()
+        page2 = page2.reload().get_draft_object()
+        page3 = page3.reload().get_draft_object()
+
+        page2.publish('en')
+        page1 = page1.reload().get_draft_object()
+        page2 = page2.reload().get_draft_object()
+        page3 = page3.reload().get_draft_object()
+
+        page3.publish('en')
+        page1 = page1.reload().get_draft_object()
+        page2 = page2.reload().get_draft_object()
+        page3 = page3.reload().get_draft_object()
+        page1_p = page1.reload().get_public_object()
+        page2_p = page2.reload().get_public_object()
+        page3_p = page3.reload().get_public_object()
 
         self.assertEqual(page1.depth, 1)
         self.assertEqual(page1.numchild, 1)
         self.assertFalse(page1.is_leaf())
 
         self.assertEqual(page2.depth, 2)
-        self.assertEqual(page2.numchild, 0)
-        self.assertTrue(page2.is_leaf())
+        self.assertEqual(page2.numchild, 1)
+        self.assertFalse(page2.is_leaf())
+
+        self.assertEqual(page3.depth, 3)
+        self.assertEqual(page3.numchild, 0)
+        self.assertTrue(page3.is_leaf())
+
+        self.assertEqual(page1_p.depth, 1)
+        self.assertEqual(page1_p.numchild, 1)
+        self.assertFalse(page1_p.is_leaf())
+
+        self.assertEqual(page2_p.depth, 2)
+        self.assertEqual(page2_p.numchild, 1)
+        self.assertFalse(page2_p.is_leaf())
+
+        self.assertEqual(page3_p.depth, 3)
+        self.assertEqual(page3_p.numchild, 0)
+        self.assertTrue(page3_p.is_leaf())
 
     def test_create_page_admin(self):
         """

cms/tests/test_publisher.py

@@ -537,9 +537,18 @@ def test_publish_ordering2(self):
         pageC = self.create_page('pageC', published=False, parent=pageA)
         pageB = self.create_page('pageB', published=False, parent=pageA)
         page = page.reload()
+        pageA = pageA.reload()
+        pageB = pageB.reload()
+        pageC = pageC.reload()
         pageA.publish('en')
+        page = page.reload()
+        pageB = pageB.reload()
+        pageC = pageC.reload()
         pageB.publish('en')
+        page = page.reload()
+        pageC = pageC.reload()
         pageC.publish('en')
+        page = page.reload()
         page.publish('en')
 
         drafts = Page.objects.filter(publisher_is_draft=True).order_by('path')
@@ -550,7 +559,6 @@ def test_publish_ordering2(self):
             self.assertEqual(draft.publisher_public_id, publics[x].pk)
             x += 1
 
-
     def test_unpublish_unpublish(self):
         name = self._testMethodName
         page = self.create_page(name, published=True)

docs/upgrade/3.1.4.rst

@@ -12,12 +12,23 @@ Bug Fixes
 =========
 
 * Fix use structure migration
-* Fix fix_tree command
+* Fix fix-tree command
 * Remove some warning for Django 1.9
 * Fix using scroll bar of plugin menu in Firefox & IE moves plugins
 * Fix JS error when using PageSelectWidget
 * Fix whitespace markup issues in draft mode
 * Detect plugin migrations layout in tests
+* Fix some treebeard corruption issues
+
+
+Treebeard corruptions
+=====================
+
+Prior to 3.1.4 deleting pages may lead to some non-fatal tree
+corruptions when results in error 500 when publishing, deleting,
+moving pages.
+To fix these issues, upgrade to 3.1.4 and then executes
+``manage.py cms fix-tree`` command to restore the correct data.