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

{django_fast_treenode-3.0.7/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.7
+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.7 → 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.7
+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.7 → 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.7 → 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.7"
+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.7 → 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.7',
+    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/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.7 → django_fast_treenode-3.0.8}/treenode/managers/queries.py

@@ -5,7 +5,7 @@ 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.7
+Version: 3.0.0
 Author: Timur Kady
 Email: timurkady@yandex.com
 """

{django_fast_treenode-3.0.7 → 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.7 → 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;

django_fast_treenode-3.0.8/treenode/static/js/treenode_admin.js

@@ -0,0 +1,322 @@
+/**
+ * treenode_admin.js
+ *
+ * Cleaned version 3.1.0 — TreeNode Admin extension for Django Admin.
+ * - No AJAX loading of children
+ * - No persistence in localStorage
+ * - Local-only expand/collapse logic
+ * - Compatible with pre-rendered full tree
+ *
+ * Version: 3.1.0
+ * Author: Timur Kady
+ * Email: timurkady@yandex.com
+ */
+
+(function($) {
+
+  // ------------------------------- //
+  // Helpers                        //
+  // ------------------------------- //
+
+  function getCookie(name) {
+    let cookieValue = null;
+    if (document.cookie && document.cookie !== '') {
+      const cookies = document.cookie.split(';');
+      for (let i = 0; i < cookies.length; i++) {
+        const cookie = cookies[i].trim();
+        if (cookie.startsWith(name + '=')) {
+          cookieValue = decodeURIComponent(cookie.substring(name.length + 1));
+          break;
+        }
+      }
+    }
+    return cookieValue;
+  }
+
+  // ------------------------------- //
+  // AJAX Setup                     //
+  // ------------------------------- //
+
+  const csrftoken = getCookie('csrftoken');
+
+  $.ajaxSetup({
+    beforeSend: function(xhr, settings) {
+      if (!/^https?:.*/.test(settings.url)) {
+        xhr.setRequestHeader("X-CSRFToken", csrftoken);
+      }
+      $('body').css('cursor', 'wait');
+    },
+    complete: function() {
+      $('body').css('cursor', 'default');
+    },
+    cache: false
+  });
+
+  // ------------------------------- //
+  // Visual feedback                 //
+  // ------------------------------- //
+
+  const TreeFx = {
+    flashInsert(nodeId) {
+      const $row = $(`tr[data-node-id="${nodeId}"]`);
+      if (!$row.length) return;
+
+      $row.addClass("flash-insert");
+      setTimeout(() => $row.removeClass("flash-insert"), 1000);
+    },
+
+    markDragging($item, enable) {
+      $item.toggleClass('dragging', enable);
+    }
+  };
+
+  // ------------------------------- //
+  // Tree logic                      //
+  // ------------------------------- //
+
+  var ChangeList = {
+    $tableBody: null,
+    isShiftPressed: false,
+    activeTargetRow: null,
+    isMoving: false,
+
+    init: function() {
+      this.$tableBody = $('table#result_list tbody');
+      this.bindEvents();
+      this.enableDragAndDrop();
+    },
+    
+    // Save expanded nodes to localStorage
+    saveTree: function() {
+      if (!this.$tableBody) return;
+    
+      // Сохраняем ТОЛЬКО те node_id, которые раскрыты
+      this.expandedNodes = this.$tableBody.find(".treenode-toggle").map(function() {
+        const $btn = $(this);
+        return $btn.data("expanded") ? $btn.data("node-id") : null;
+      }).get().filter(Boolean);
+    
+      if (this.expandedNodes.length === 0) {
+        localStorage.removeItem("treenode_expanded");
+      } else {
+        localStorage.setItem("treenode_expanded", JSON.stringify(this.expandedNodes));
+      }
+    
+      const count = $("#result_list tbody tr").length;
+      if (count > 0) {
+        $("p.paginator").first().text(`${count} ${ChangeList.label}`);
+        localStorage.setItem("label", ChangeList.label);
+      }
+    },
+
+    
+    // Restore expanded nodes from localStorage
+    restoreTreeState: function() {
+      const expanded = JSON.parse(localStorage.getItem("treenode_expanded") || "[]");
+      for (const nodeId of expanded) {
+        ChangeList.expandNode(nodeId);
+      }
+    },
+
+    expandNode: function(nodeId) {
+      const $row = this.$tableBody.find(`tr[data-node-id="${nodeId}"]`);
+      const $btn = $row.find(".treenode-toggle");
+      $btn.text("▼").data("expanded", true);
+      this.showChildren(nodeId);
+      this.saveTree();
+    },
+
+    collapseNode: function(nodeId) {
+      const $row = this.$tableBody.find(`tr[data-node-id="${nodeId}"]`);
+      const $btn = $row.find(".treenode-toggle");
+      $btn.text("►").data("expanded", false);  // <-- ВАЖНО!
+      this.hideChildrenRecursive(nodeId);
+      this.saveTree();
+    },
+
+    toggleNode: function($btn) {
+      const nodeId = $btn.data("node-id");
+      const isExpanded = $btn.data("expanded");
+      if (isExpanded) {
+        this.collapseNode(nodeId);
+      } else {
+        this.expandNode(nodeId);
+      }
+    },
+
+    showChildren: function(parentId) {
+      const $children = this.$tableBody.find(`tr[data-parent-id="${parentId}"]`);
+      $children.removeClass("treenode-hidden");
+
+      $children.each((_, child) => {
+        const $child = $(child);
+        const childId = $child.data("node-id");
+        const $toggle = $child.find(".treenode-toggle");
+        if ($toggle.data("expanded")) {
+          this.showChildren(childId);
+        }
+      });
+    },
+
+    hideChildrenRecursive: function(parentId) {
+      const $children = this.$tableBody.find(`tr[data-parent-id="${parentId}"]`);
+      $children.addClass("treenode-hidden");
+
+      $children.each((_, child) => {
+        const childId = $(child).data("node-id");
+        this.hideChildrenRecursive(childId);
+      });
+    },
+
+    expandAll: function() {
+      const self = this;
+      this.$tableBody.find("button.treenode-toggle").each(function() {
+        self.expandNode($(this).data("node-id"));
+      });
+    },
+
+    collapseAll: function() {
+      const self = this;
+      this.$tableBody.find("button.treenode-toggle").each(function() {
+        self.collapseNode($(this).data("node-id"));
+      });
+    },
+
+    bindEvents: function() {
+      const self = this;
+
+      $(document).on("click", "button.treenode-toggle", function(e) {
+        e.preventDefault();
+        self.toggleNode($(this));
+      });
+
+      $(document).on("click", ".treenode-expand-all", function() {
+        self.expandAll();
+      });
+
+      $(document).on("click", ".treenode-collapse-all", function() {
+        self.collapseAll();
+      });
+
+      $(document).on("keydown", function(e) {
+        if (e.key === "Shift") {
+          self.isShiftPressed = true;
+          self.updateDndHighlight();
+        }
+      }).on("keyup", function(e) {
+        if (e.key === "Shift") {
+          self.isShiftPressed = false;
+          self.updateDndHighlight();
+        }
+      });
+
+      $('#result_list').on('change', '#action-toggle', function() {
+        $('input.action-select').prop('checked', this.checked);
+      });
+    },
+
+    enableDragAndDrop: function() {
+      const self = this;
+
+      this.$tableBody.sortable({
+        items: "tr",
+        handle: ".treenode-drag-handle",
+        placeholder: "treenode-placeholder",
+        helper: function(e, tr) {
+          const $originals = tr.children();
+          const $helper = tr.clone();
+          $helper.find('[id]').removeAttr('id');
+          $helper.children().each(function(index) {
+            $(this).width($originals.eq(index).width());
+          });
+          return $helper;
+        },
+        start: function(e, ui) {
+          TreeFx.markDragging(ui.item, true);
+        },
+        over: function(e, ui) {
+          self.updateDndHighlight();
+        },
+        stop: function(e, ui) {
+          TreeFx.markDragging(ui.item, false);
+          const $item = ui.item;
+          const nodeId = $item.data("node-id");
+          const prevId = $item.prev().data("node-id") || null;
+          const mode = self.isShiftPressed ? 'child' : 'after';
+
+          if (self.activeTargetRow) {
+            self.activeTargetRow.removeClass("target-as-child");
+            self.activeTargetRow = null;
+          }
+
+          self.applyMove(nodeId, prevId, mode);
+          TreeFx.flashInsert(nodeId);
+        },
+      });
+    },
+
+    updateDndHighlight: function() {
+      const $placeholder = this.$tableBody.find("tr.treenode-placeholder");
+      const $target = $placeholder.prev();
+
+      if (!$target.length || !$target.data("node-id")) {
+        this.$tableBody.find("tr.target-as-child").removeClass("target-as-child");
+        this.activeTargetRow = null;
+        return;
+      }
+
+      if (this.isShiftPressed) {
+        if (!this.activeTargetRow || !this.activeTargetRow.is($target)) {
+          this.$tableBody.find("tr.target-as-child").removeClass("target-as-child");
+          $target.addClass("target-as-child");
+          this.activeTargetRow = $target;
+        }
+      } else {
+        if (this.activeTargetRow) {
+          this.activeTargetRow.removeClass("target-as-child");
+          this.activeTargetRow = null;
+        }
+      }
+    },
+
+    applyMove: function(nodeId, targetId, mode) {
+      if (this.isMoving) return;
+
+      this.isMoving = true;
+      this.activeTargetRow = null;
+
+      const params = {
+        node_id: nodeId,
+        target_id: targetId,
+        mode: mode
+      };
+
+      $.ajax({
+        url: 'move/',
+        method: 'POST',
+        data: params,
+        dataType: 'json',
+        success: function(data) {
+          const msg = data.message || "Node moved successfully.";
+          $("<li class='success'>" + msg + "</li>").appendTo(".messagelist");
+        },
+        error: function(xhr, status, error) {
+          const fallback = "Error moving node.";
+          $("<li class='error'>" + (xhr.responseText || fallback) + "</li>").appendTo(".messagelist");
+        },
+        complete: function() {
+          ChangeList.isMoving = false;
+          location.reload();
+        }
+      });
+    }
+  };
+
+  $(document).ready(function () {
+    if ($("table#result_list").length) {
+      ChangeList.init();
+      ChangeList.restoreTreeState();
+    }
+  });
+
+})(django.jQuery || window.jQuery);