More django-tree-queries reuse

matthiask · matthiask · commit bd47cbb423b0 · 2025-11-27T20:56:26.000+01:00
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -14,6 +14,8 @@ Next version
   ``TreeAdmin`` and ``AncestorFilter`` from there.
 - Added the ``referrerpolicy`` attribute to YouTube IFRAMEs, seems to solve
   some of the embedding problems we have been seeing.
+- Started depending on the new ``OrderableTreeNode`` in django-tree-queries
+  0.23.
 
 
 5.4 (2025-06-19)
diff --git a/feincms3/pages.py b/feincms3/pages.py
@@ -1,13 +1,13 @@
 from collections import OrderedDict
 
 from django.core.checks import Warning
-from django.core.validators import MinValueValidator, RegexValidator
+from django.core.validators import RegexValidator
 from django.db import models
-from django.db.models import Max, Q
+from django.db.models import Q
 from django.urls import NoReverseMatch, get_script_prefix, reverse
 from django.utils.encoding import iri_to_uri
 from django.utils.translation import gettext_lazy as _
-from tree_queries.models import TreeNode, TreeQuerySet
+from tree_queries.models import OrderableTreeNode, TreeQuerySet
 
 from feincms3.utils import validation_error
 
@@ -51,7 +51,7 @@ def applications(self):
         )
 
 
-class AbstractPage(TreeNode):
+class AbstractPage(OrderableTreeNode):
     """
     Short version: If you want to build a CMS with a hierarchical page
     structure, use this base class.
@@ -83,16 +83,6 @@ class AbstractPage(TreeNode):
     is_active = models.BooleanField(_("is active"), default=True)
     title = models.CharField(_("title"), max_length=200)
     slug = models.SlugField(_("slug"))
-    position = models.PositiveIntegerField(
-        db_index=True,
-        editable=False,
-        validators=[
-            MinValueValidator(
-                limit_value=1,
-                message=_("Position is expected to be greater than zero."),
-            )
-        ],
-    )
 
     # Who even cares about MySQL
     path = models.CharField(
@@ -115,9 +105,8 @@ class AbstractPage(TreeNode):
 
     objects = AbstractPageQuerySet.as_manager(with_tree_fields=True)
 
-    class Meta:
+    class Meta(OrderableTreeNode.Meta):
         abstract = True
-        ordering = ("position",)
         verbose_name = _("page")
         verbose_name_plural = _("pages")
 
@@ -214,14 +203,6 @@ def save(self, *args, **kwargs):
                 self.parent.path if self.parent else "/", self.slug
             )
 
-        if not self.position:
-            self.position = 10 + (
-                self.__class__._default_manager.filter(parent_id=self.parent_id)
-                .order_by()
-                .aggregate(p=Max("position"))["p"]
-                or 0
-            )
-
         super().save(*args, **kwargs)
 
         if save_descendants is True or (
diff --git a/pyproject.toml b/pyproject.toml
@@ -38,7 +38,7 @@ dependencies = [
   "django>=3.2",
   "django-content-editor>=6",
   "django-js-asset>=2",
-  "django-tree-queries[admin]>=0.21",
+  "django-tree-queries[admin]>=0.23",
 ]
 optional-dependencies.all = [
   "django-imagefield",

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ dependencies = [`
`38`	`38`	`"django>=3.2",`
`39`	`39`	`"django-content-editor>=6",`
`40`	`40`	`"django-js-asset>=2",`
`41`		`- "django-tree-queries[admin]>=0.21",`
	`41`	`+ "django-tree-queries[admin]>=0.23",`
`42`	`42`	`]`
`43`	`43`	`optional-dependencies.all = [`
`44`	`44`	`"django-imagefield",`