django-fast-treenode 3.0.6__tar.gz → 3.0.7__tar.gz

{django_fast_treenode-3.0.6/django_fast_treenode.egg-info → django_fast_treenode-3.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-fast-treenode
-Version: 3.0.6
+Version: 3.0.7
 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.0.6 → django_fast_treenode-3.0.7/django_fast_treenode.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-fast-treenode
-Version: 3.0.6
+Version: 3.0.7
 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.0.6 → django_fast_treenode-3.0.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "django-fast-treenode"
-version = "3.0.6"
+version = "3.0.7"
 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.0.6 → django_fast_treenode-3.0.7}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='django-fast-treenode',
-    version='3.0.6',
+    version='3.0.7',
     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.0.7/treenode/__init__.py

@@ -0,0 +1 @@
+default_app_config = 'treenode.apps.TreeNodeConfig'

{django_fast_treenode-3.0.6 → django_fast_treenode-3.0.7}/treenode/admin/admin.py

@@ -2,7 +2,7 @@
 """
 TreeNode Admin Model Class
 
-Version: 3.0.0
+Version: 3.0.7
 Author: Timur Kady
 Email: timurkady@yandex.com
 """
@@ -12,6 +12,7 @@ from django.contrib import admin
 from django.db import models
 from django.http import HttpResponseRedirect
 from django.urls import reverse
+from django.utils.html import escape
 from django.utils.safestring import mark_safe
 from django.utils.translation import gettext_lazy as _
 
@@ -102,10 +103,27 @@ class TreeNodeModelAdmin(AdminMixin, admin.ModelAdmin):
                 f'<span style="padding-left: {level * 1.5}em;">'
                 f'{icon}<a href="{edit_url}">{str(obj)}</a></span>'
             )
-        elif self.treenode_display_mode == self.TREENODE_DISPLAY_MODE_BREADCRUMBS:  # noqa
-            breadcrumbs = obj.get_breadcrumbs(
-                attr=getattr(obj, 'treenode_display_field', 'id'))
-            content = " / ".join(map(str, breadcrumbs))
+        elif self.treenode_display_mode == self.TREENODE_DISPLAY_MODE_BREADCRUMBS:
+            breadcrumbs = obj.get_ancestors(include_self=True)
+            model_label = obj._meta.app_label
+            model_name = obj._meta.model_name
+            href = f"admin:{model_label}_{model_name}_change"
+
+            display_attr = getattr(obj, 'display_field', 'id')
+
+            records = [
+                (
+                    getattr(item, display_attr, item.pk),
+                    reverse(href, args=[item.pk]),
+                )
+                for item in breadcrumbs
+            ]
+
+            content = " / ".join([
+                f'<a href="{url}">{escape(label)}</a>'
+                for label, url in records
+            ])
+
         elif self.treenode_display_mode == self.TREENODE_DISPLAY_MODE_INDENTATION:  # noqa
             indent = "&mdash;" * level
             content = f'{indent}<a href="{edit_url}">{str(obj)}</a>'

{django_fast_treenode-3.0.6 → django_fast_treenode-3.0.7}/treenode/admin/mixin.py

@@ -4,7 +4,7 @@ TreeNode Admin Model Class Mixin
 
 Views for AdminModel
 
-Version: 3.0.0
+Version: 3.0.7
 Author: Timur Kady
 Email: timurkady@yandex.com
 """

{django_fast_treenode-3.0.6 → django_fast_treenode-3.0.7}/treenode/managers/queries.py

@@ -5,14 +5,13 @@ Low-level SQL Query Manager.
 Encapsulates all logic to retrieve related primary keys based on relationships
 (e.g., ancestors, children, descendants, siblings, family, root) using raw SQL.
 
-Version: 3.0.4
+Version: 3.0.7
 Author: Timur Kady
 Email: timurkady@yandex.com
 """
 
 
 from django.db import connection
-from ..utils.db.sqlcompat import SQLCompat 
 
 
 class TreeQuery:
@@ -33,6 +32,19 @@ class TreeQuery:
             cursor.execute(sql, params)
             return cursor.fetchall()
 
+    def wrap_union_all(self, queries):
+        """
+        Combine multiple SQL queries using UNION ALL.
+
+        Each query is a tuple: (sql, params).
+        Returns a tuple: (combined_sql, combined_params).
+        """
+        union_query = " UNION ALL ".join(f"({q[0]})" for q in queries)
+        combined_params = []
+        for q in queries:
+            combined_params.extend(q[1])
+        return union_query, combined_params
+
     def order_by(self, sql, order_by_clause):
         """Wrap the SQL in an outer query to enforce ordering."""
         return f"SELECT * FROM ({sql}) AS combined ORDER BY {order_by_clause}"
@@ -64,7 +76,7 @@ class TreeQuery:
         if include_self:
             sql2 = f"SELECT id, priority FROM {self.db_table} WHERE id = %s"
             params2 = [self.node.pk]
-            combined_sql, combined_params = SQLCompat.wrap_union_all(
+            combined_sql, combined_params = self.wrap_union_all(
                 [(sql1, params1), (sql2, params2)])
             sql = self.order_by(combined_sql, "priority")
             return sql, combined_params
@@ -103,7 +115,7 @@ class TreeQuery:
                 FROM {self.db_table}
                 WHERE id = %s
             """
-            union_sql, union_params = SQLCompat.wrap_union_all([
+            union_sql, union_params = self.wrap_union_all([
                 (base_sql, params),
                 (sql_self, [self.node.pk])
             ])
@@ -136,7 +148,7 @@ class TreeQuery:
 
         if include_self:
             sql_self = f"SELECT id, _depth, priority FROM {self.db_table} WHERE id = %s"  # noqa: D501
-            union_sql, union_params = SQLCompat.wrap_union_all(
+            union_sql, union_params = self.wrap_union_all(
                 [(base_sql, params), (sql_self, [self.node.pk])])
         else:
             union_sql, union_params = base_sql, params
@@ -186,7 +198,7 @@ class TreeQuery:
         if include_self:
             sql_self = f"SELECT id, _depth, priority FROM {self.db_table} WHERE id = %s"  # noqa: D501
             queries.append((sql_self, [self.node.pk]))
-        combined_sql, combined_params = SQLCompat.wrap_union_all(queries)
+        combined_sql, combined_params = self.wrap_union_all(queries)
         combined_sql = self.order_by(combined_sql, "_depth, priority")
         return combined_sql, combined_params
 

{django_fast_treenode-3.0.6 → django_fast_treenode-3.0.7}/treenode/models/models.py

@@ -14,7 +14,7 @@ Features:
 - Provides a caching mechanism to optimize performance.
 - Includes methods for tree traversal, manipulation, and serialization.
 
-Version: 3.0.0
+Version: 3.0.7
 Author: Timur Kady
 Email: timurkady@yandex.com
 
@@ -122,7 +122,7 @@ class TreeNodeModel(
 
     def __str__(self):
         """Return a human-readable string representation of an object."""
-        field = getattr(type(self), 'display_field', None)
+        field = getattr(self, 'display_field', None)
         if field and hasattr(self, field):
             return str(getattr(self, field))
         return f'Node {self.pk}'