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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-fast-treenode
-Version: 3.0.6
+Version: 3.0.8
 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.8/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.8
 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.8}/docs/admin.md

@@ -16,7 +16,6 @@ class CategoryAdmin(TreeNodeModelAdmin):
     # Set the display mode: 'accordion', 'breadcrumbs', or 'indentation'
     treenode_display_mode = TreeNodeModelAdmin.TREENODE_DISPLAY_MODE_ACCORDION
     # treenode_display_mode = TreeNodeModelAdmin.TREENODE_DISPLAY_MODE_BREADCRUMBS
-    # treenode_display_mode = TreeNodeModelAdmin.TREENODE_DISPLAY_MODE_INDENTATION
 
     list_display = ("name",)
     search_fields = ("name",)
@@ -30,8 +29,6 @@ You can choose from three display modes:
   Expands/collapses nodes dynamically.
 - **`TREENODE_DISPLAY_MODE_BREADCRUMBS`**  
   Displays the tree as a sequence of **breadcrumbs**, making it easy to navigate.
-- **`TREENODE_DISPLAY_MODE_INDENTATION`**  
-  Uses a **long dash** (`———`) to indicate nesting levels, providing a simple visual structure.
 
 The accordion mode is **always active**, and the setting only affects how nodes are displayed.
 

{django_fast_treenode-3.0.6 → django_fast_treenode-3.0.8}/pyproject.toml

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

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

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

django_fast_treenode-3.0.8/treenode/admin/admin.py

@@ -0,0 +1,222 @@
+# -*- coding: utf-8 -*-
+"""
+TreeNode Admin Model Class
+
+Modified admin panel for django-fast-treenode. Solves the following problems:
+- Set list_per_page = 10000 to display all elements at once.
+- Hidden standard pagination via CSS
+- Disabled counting the total number of elements to speed up loading
+- Accordion works regardless of the display mode
+Two modes are supported:
+- Indented - with indents and icons
+- Breadcrumbs - with breadcrumbs
+All modes have links to editing objects.
+
+- Expand buttons for nodes with children
+
+Additional features:
+- Control panel with "Expand All" / "Collapse All" buttons
+- Saving the state of the tree between page transitions
+- Smooth animations when expanding/collapsing
+- Counting the total number of nodes in the tree
+- Recursive hiding of grandchildren when collapsing the parent
+
+Version: 3.1.0
+Author: Timur Kady
+Email: timurkady@yandex.com
+"""
+
+
+from django.contrib import admin
+from django.db import models
+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 _
+
+from .mixin import AdminMixin
+from ..forms import TreeNodeForm
+from ..widgets import TreeWidget
+from .importer import TreeNodeImporter
+from .exporter import TreeNodeExporter
+
+import logging
+
+logger = logging.getLogger(__name__)
+
+
+class TreeNodeModelAdmin(AdminMixin, admin.ModelAdmin):
+    """Admin for TreeNodeModel."""
+
+    # Режимы отображения
+    TREENODE_DISPLAY_MODE_ACCORDION = 'accordion'
+    TREENODE_DISPLAY_MODE_BREADCRUMBS = 'breadcrumbs'
+    treenode_display_mode = TREENODE_DISPLAY_MODE_ACCORDION
+
+    form = TreeNodeForm
+    importer_class = None
+    exporter_class = None
+    ordering = []
+
+    formfield_overrides = {
+        models.ForeignKey: {'widget': TreeWidget()},
+    }
+
+    change_list_template = "treenode/admin/treenode_changelist.html"
+    import_export = True
+
+    class Media:
+        """Meta Class."""
+
+        css = {"all": (
+            "css/treenode_admin.css",
+            "vendors/jquery-ui/jquery-ui.css",
+        )}
+        js = (
+            "vendors/jquery-ui/jquery-ui.js",
+            # "js/lz-string.min.js",
+            "js/treenode_admin.js",
+        )
+
+    def __init__(self, model, admin_site):
+        """Init method."""
+        super().__init__(model, admin_site)
+
+        if not self.list_display:
+            self.list_display = [field.name for field in model._meta.fields]
+
+        self.TreeNodeImporter = self.importer_class or TreeNodeImporter
+        self.TreeNodeExporter = self.exporter_class or TreeNodeExporter
+
+    def drag(self, obj):
+        """Drag and drop сolumn."""
+        return mark_safe('<span class="treenode-drag-handle">&#9776;</span>')
+
+    drag.short_description = _("Move")
+
+    def toggle(self, obj):
+        """Toggle column."""
+        if obj.get_children_count() > 0:
+            return mark_safe(
+                f'<button class="treenode-toggle" data-node-id="{obj.pk}">►</button>'  # noqa
+            )
+        return mark_safe('<div class="treenode-space">&nbsp;</div>')
+
+    toggle.short_description = _("Expand")
+
+    def get_changelist(self, request, **kwargs):
+        """Get changelist."""
+        ChangeList = super().get_changelist(request, **kwargs)
+
+        class NoPaginationChangeList(ChangeList):
+            """Suppress pagination."""
+
+            def get_results(self, request):
+                """Get result."""
+                super().get_results(request)
+                self.paginator.show_all = True
+                self.result_count = len(self.result_list)
+                self.full_result_count = len(self.result_list)
+                self.can_show_all = False
+                self.multi_page = False
+                self.actions = self.model_admin.get_actions(request)
+
+        return NoPaginationChangeList
+
+    def get_changelist_instance(self, request):
+        """
+        Get changelist instance.
+
+        Make sure our custom ChangeList is used without pagination.
+        """
+        ChangeList = self.get_changelist(request)
+
+        return ChangeList(
+            request,
+            self.model,
+            self.get_list_display(request),
+            self.get_list_display_links(
+                request,
+                self.get_list_display(request)
+            ),
+            self.get_list_filter(request),
+            self.date_hierarchy,
+            self.search_fields,
+            self.list_select_related,
+            self.list_per_page,
+            self.list_max_show_all,
+            self.list_editable,
+            self,
+            sortable_by=self.get_sortable_by(request),
+            search_help_text=self.get_search_help_text(request),
+        )
+
+    def get_queryset(self, request):
+        """Get queryset."""
+        qs = super().get_queryset(request)
+        return qs.select_related('parent')\
+            .prefetch_related('children')\
+            .order_by('_path')
+
+    def get_list_display(self, request):
+        """Get list_display."""
+        def treenode_field(obj):
+            return self._get_treenode_field_display(request, obj)
+
+        description = str(self.model._meta.verbose_name)
+        treenode_field.short_description = description
+
+        return (self.drag, self.toggle, treenode_field)
+
+    def get_form(self, request, obj=None, **kwargs):
+        """Get Form method."""
+        form = super().get_form(request, obj, **kwargs)
+        if "parent" in form.base_fields:
+            form.base_fields["parent"].widget = TreeWidget()
+        return form
+
+    def get_search_fields(self, request):
+        """Get search fields."""
+        return [getattr(self.model, 'display_field', 'id') or 'id']
+
+    def _get_treenode_field_display(self, request, obj):
+        """
+        Generate HTML to display tree nodes.
+
+        Depending on the selected display mode (accordion or breadcrumbs),
+        do the following:
+        - For accordion mode: add indents and icons.
+        - For breadcrumbs mode: display breadcrumb path.
+        """
+        level = obj.get_depth()
+        display_field = getattr(obj, "display_field", None)
+        edit_url = reverse(
+            f"admin:{obj._meta.app_label}_{obj._meta.model_name}_change",
+            args=[obj.pk]
+        )
+        icon = ""
+        text = ""
+        padding = ""
+        closing = ""
+
+        if self.treenode_display_mode == self.TREENODE_DISPLAY_MODE_ACCORDION:
+            icon = "📄 " if obj.is_leaf() else "📁 "
+            text = getattr(obj, display_field, str(obj))
+            padding = f'<span style="padding-left: {level * 1.5}em;">'
+            closing = "</span>"
+        elif self.treenode_display_mode == self.TREENODE_DISPLAY_MODE_BREADCRUMBS:  # noqa
+            if display_field:
+                breadcrumbs = obj.get_breadcrumbs(attr=display_field)
+            else:
+                breadcrumbs = [str(item) for item in obj.get_ancestors()]
+
+            text = "/" + "/".join([escape(label) for label in breadcrumbs])
+
+        content = f'{padding}{icon}<a href="{edit_url}">{escape(text)}</a>{closing}'  # noqa
+        return mark_safe(content)
+
+    def get_list_per_page(self, request):
+        """Get list per page."""
+        return 999999
+
+# The End

{django_fast_treenode-3.0.6 → django_fast_treenode-3.0.8}/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.8}/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.0
 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.8}/treenode/managers/tasks.py

@@ -2,7 +2,7 @@
 """
 TreeNode TaskQuery manager
 
-Version: 3.0.4
+Version: 3.0.1
 Author: Timur Kady
 Email: timurkady@yandex.com
 """

{django_fast_treenode-3.0.6 → django_fast_treenode-3.0.8}/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}'

{django_fast_treenode-3.0.6 → django_fast_treenode-3.0.8}/treenode/static/css/treenode_admin.css

@@ -66,6 +66,27 @@ Email: timurkady@yandex.com
     opacity: 1.0;
 }
 
+.treenode-toolbar{
+  display: flex;
+}
+
+.treenode-toolbar {
+  margin: 15px 0px;
+}
+
+.treenode-button {
+  padding: 5px !important;
+  margin-left: 15px !important;
+}
+
+tr.treenode-hidden {
+  display: none;
+}
+
+td.action-checkbox{
+  text-align: center;
+}
+
 .dark-theme .treenode-toggle {
     color: #ccc;
     background-color: #444;