django-fast-treenode 3.2.2__tar.gz → 3.2.4__tar.gz

{django_fast_treenode-3.2.2/django_fast_treenode.egg-info → django_fast_treenode-3.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-fast-treenode
-Version: 3.2.2
+Version: 3.2.4
 Summary: Treenode Framework for supporting tree (hierarchical) data structure in Django projects
 Home-page: https://django-fast-treenode.readthedocs.io/
 Author: Timur Kady

{django_fast_treenode-3.2.2 → django_fast_treenode-3.2.4/django_fast_treenode.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-fast-treenode
-Version: 3.2.2
+Version: 3.2.4
 Summary: Treenode Framework for supporting tree (hierarchical) data structure in Django projects
 Home-page: https://django-fast-treenode.readthedocs.io/
 Author: Timur Kady

{django_fast_treenode-3.2.2 → django_fast_treenode-3.2.4}/docs/models.md

@@ -121,6 +121,13 @@ class Category(TreeNodeModel):
 
 This approach ensures full Django integration, efficient queries, and correct hierarchical behavior.
 
+!!! important
+    Do **not** override `Meta.ordering` in models based on `TreeNodeModel`.
+    Internal ordering relies on the `_path` field to keep the hierarchy intact
+    in the admin interface and elsewhere. To control sibling order, use the
+    `sorting_field` attribute instead.
+
+
 ---
 
 ### Model Extending

{django_fast_treenode-3.2.2 → django_fast_treenode-3.2.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "django-fast-treenode"
-version = "3.2.2"
+version = "3.2.4"
 description = "Treenode Framework for supporting tree (hierarchical) data structure in Django projects"
 readme = "README.md"
 authors = [{ name = "Timur Kady", email = "timurkady@yandex.com" }]

{django_fast_treenode-3.2.2 → django_fast_treenode-3.2.4}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='django-fast-treenode',
-    version='3.2.2',
+    version='3.2.4',
     description='Treenode Framework for supporting tree (hierarchical) data structure in Django projects',
     long_description=open('README.md', encoding='utf-8').read(),
     long_description_content_type='text/markdown',

{django_fast_treenode-3.2.2 → django_fast_treenode-3.2.4}/treenode/admin/admin.py

@@ -36,6 +36,7 @@ from django.utils.translation import gettext_lazy as _
 
 from .mixin import AdminMixin
 from ..forms import TreeNodeForm
+from ..models import TreeNodeModel
 from ..widgets import TreeWidget
 from .importer import TreeNodeImporter
 from .exporter import TreeNodeExporter
@@ -57,11 +58,6 @@ class TreeNodeModelAdmin(AdminMixin, admin.ModelAdmin):
     importer_class = None
     exporter_class = None
     ordering = []
-
-    formfield_overrides = {
-        models.ForeignKey: {'widget': TreeWidget()},
-    }
-
     change_list_template = "treenode/admin/treenode_changelist.html"
     import_export = True
 
@@ -175,6 +171,18 @@ class TreeNodeModelAdmin(AdminMixin, admin.ModelAdmin):
             form.base_fields["parent"].widget = TreeWidget()
         return form
 
+    def formfield_for_foreignkey(self, db_field, request, **kwargs):
+        """Use TreeWidget only for 'parent' field."""
+        formfield = super().formfield_for_foreignkey(db_field, request, **kwargs)
+
+        if db_field.name == "parent":
+            related = getattr(db_field.remote_field, "model", None)
+            if related and issubclass(related, TreeNodeModel):
+                formfield.widget = TreeWidget()
+                formfield.widget.model = related
+        return formfield
+
+
     def get_search_fields(self, request):
         """Get search fields."""
         return [getattr(self.model, 'display_field', 'id') or 'id']

{django_fast_treenode-3.2.2 → django_fast_treenode-3.2.4}/treenode/version.py

@@ -4,9 +4,9 @@ TreeNode Version Module
 
 This module defines the current version of the TreeNode package.
 
-Version: 3.2.2
+Version: 3.2.4
 Author: Timur Kady
 Email: timurkady@yandex.com
 """
 
-__version__ = '3.2.2'
+__version__ = '3.2.4'

{django_fast_treenode-3.2.2 → django_fast_treenode-3.2.4}/treenode/views/common.py

@@ -1,23 +1,30 @@
-# -*- coding: utf-8 -*-
-"""
-Created on Thu Apr 10 19:50:23 2025
-
-Version: 3.0.0
-Author: Timur Kady
-Email: timurkady@yandex.com
-"""
-
-from django.apps import apps
-from django.http import Http404
-
-
-def get_model_from_request(request):
-    """Get model from request."""
-    model_label = request.GET.get("model")
-    if not model_label:
-        raise Http404("Missing 'model' parameter.")
-    try:
-        app_label, model_name = model_label.lower().split(".")
-        return apps.get_model(app_label, model_name)
-    except Exception:
-        raise Http404(f"Invalid model format: {model_label}")
+# -*- coding: utf-8 -*-
+"""
+Created on Thu Apr 10 19:50:23 2025
+
+Version: 3.0.0
+Author: Timur Kady
+Email: timurkady@yandex.com
+"""
+
+from django.apps import apps
+from django.http import Http404
+
+from ..models import TreeNodeModel
+
+def get_model_from_request(request):
+    """Get model from request."""
+    model_label = request.GET.get("model")
+    if not model_label:
+        raise Http404("Missing 'model' parameter.")
+    try:
+        app_label, model_name = model_label.lower().split(".")
+        model = apps.get_model(app_label, model_name)
+    except Exception:
+        raise Http404(f"Invalid model format: {model_label}")
+
+    # Ensure the model is a subclass of TreeNodeModel
+    if not issubclass(model, TreeNodeModel):
+        raise Http404(f"{model_label} is not a TreeNodeModel.")
+
+    return model