django-fast-treenode 3.2.2__py3-none-any.whl → 3.2.4__py3-none-any.whl

{django_fast_treenode-3.2.2.dist-info → django_fast_treenode-3.2.4.dist-info}/METADATA

@@ -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.dist-info → django_fast_treenode-3.2.4.dist-info}/RECORD

@@ -1,4 +1,4 @@
-django_fast_treenode-3.2.2.dist-info/licenses/LICENSE,sha256=SSYqS84FCnAW7tAxmjBKU8qAa8Jv4VGPuSSGeHwWtJE,1095
+django_fast_treenode-3.2.4.dist-info/licenses/LICENSE,sha256=SSYqS84FCnAW7tAxmjBKU8qAa8Jv4VGPuSSGeHwWtJE,1095
 treenode/__init__.py,sha256=3z1hWpHyy4wg6uz7HCmRi9FaXYeN5CfANVpa77UIoPw,53
 treenode/apps.py,sha256=QlwjNDM9rkUoWB8Vm8-OkS6lNx0-aTByuGZlu9wrQMs,1832
 treenode/cache.py,sha256=2jUiiecfFxwB7QFukpU4u0FnDzGH6hNRfo6KAYvs6vM,8447
@@ -7,10 +7,10 @@ treenode/settings.py,sha256=FRGK7hl_Tnxp4sGbUNxJgEQP9niDJjLhcNBtmloOvHk,741
 treenode/signals.py,sha256=ERrlKjGqhYaPYVKKRk1JBBlPFOmJKpJ6bXsJavcTlo0,518
 treenode/tests.py,sha256=2uDafv3Ns6f7Vy1ekUtgYxCZEi1KRyesZDTAFhYcX-E,63
 treenode/urls.py,sha256=krHvVigc_dxC0z5hEd2rgeH6th8jW7qJY3Qbia-419Y,240
-treenode/version.py,sha256=q3WMjIC19sBswfw551UFRBugqrkG-f-MMq_yCDGtncA,220
+treenode/version.py,sha256=22jZHZDIjdmdCR5HIZoLlMT-1fx5e5UE5RLPxSTtKyI,220
 treenode/widgets.py,sha256=3kSby7v-gpyUHmAIFZCENM8hzT1xcHJFB4op8XU6YEQ,4035
 treenode/admin/__init__.py,sha256=XNEYHdF5lKb0vpdlVxdR2fxj5oUgzyx1YyCwsv0gxHw,100
-treenode/admin/admin.py,sha256=cbiqlzXwK-W73DTJqvXo_abtnK1JwEwyBEOl0bmgsa4,7507
+treenode/admin/admin.py,sha256=YOBtqENbBNssXv7TztkNsQ8d2eMN0dlQq-MZb8pYKFM,7960
 treenode/admin/changelist.py,sha256=KUYS9MaR8Ck_1xmMqupobxWKarrJEqmHuEG32CL01Bo,1662
 treenode/admin/exporter.py,sha256=QE74V6W3tvwA5kCvBt1MmVlLOaWh-o8EU63cgmiwD5Q,5724
 treenode/admin/importer.py,sha256=hK3D-1DZcoowGblRluGzng3n5Bf__hMsbNaIGXRpRdg,6263
@@ -89,10 +89,10 @@ treenode/views/__init__.py,sha256=ppxbBx51TUaKstJFpAd_DTmbKjbZGmVMLNYSpgUKnd0,11
 treenode/views/autoapi.py,sha256=X7r8hgzJ9LGO1k_keh9YfLk3dzVbjW-sVte5Ddp_HVE,3771
 treenode/views/autocomplete.py,sha256=ERGJT4jfCE2GUv94Ja8SgJyG1FOAyqIeB0PKH1fyU7g,1417
 treenode/views/children.py,sha256=seO0SNKriRY2FJOO1oZgX42iKolXMf3EF76GrfdJZLQ,1111
-treenode/views/common.py,sha256=kUN3IgMZCdNdJ2haxB9MTGcn2rctyFUAHNagzcu9wXk,594
+treenode/views/common.py,sha256=nT-qrY6MUNMMtyHqMb7b_Z0JOb8yP9DprjfpekRv3p4,842
 treenode/views/crud.py,sha256=RI5rdyD4hZTszjZFThByxi_lkAeJlqbDCXFkD8iyzKE,7424
 treenode/views/search.py,sha256=c_GyooT3jyoNa96bBxfoWruRN1wIw-ZGYvwGKkGojTs,1501
-django_fast_treenode-3.2.2.dist-info/METADATA,sha256=Wa6Z3_h5nGmUHsqGAcNPCwlAtwLsEUDsPXgOWn3hdmw,10377
-django_fast_treenode-3.2.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-django_fast_treenode-3.2.2.dist-info/top_level.txt,sha256=fmgxHbXyx1O2MPi_9kjx8aL9L-8TmV0gre4Go8XgqFk,9
-django_fast_treenode-3.2.2.dist-info/RECORD,,
+django_fast_treenode-3.2.4.dist-info/METADATA,sha256=CuHWeU260GRhBahkoiYT4Pt3QmGQZ6RoFzJN6tbuNMw,10377
+django_fast_treenode-3.2.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+django_fast_treenode-3.2.4.dist-info/top_level.txt,sha256=fmgxHbXyx1O2MPi_9kjx8aL9L-8TmV0gre4Go8XgqFk,9
+django_fast_treenode-3.2.4.dist-info/RECORD,,

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']

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'

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