django-fast-treenode 3.0.7__py3-none-any.whl → 3.0.8__py3-none-any.whl

treenode/templates/treenode/admin/treenode_changelist.html

@@ -2,24 +2,70 @@
 {% load admin_list %}
 {% load i18n %}
 {% load treenode_admin %}
+{% load static %}
 
-{% block object-tools-items %}
-    {{ block.super }}
-    {% if import_export_enabled %}
-        <li><a href="import/" class="button">Import</a></li>
-        <li><a href="export/" class="button">Export</a></li>
+{% block content %}
+
+  {% block object-tools %}
+    {% if has_add_permission %}
+      <ul class="object-tools">
+        {% block object-tools-items %}
+          {{ block.super }}
+          <li><a href="import/" class="button">Import</a></li>
+          <li><a href="export/" class="button">Export</a></li>
+        {% endblock %}
+      </ul>
     {% endif %}
-{% endblock %}
+  {% endblock %}
+  
+  <div id="changelist" class="module filtered">
+    <div class="changelist-form-container">
+
+      {# Search bar + expand/collapse buttons #}
+      {% block search %}
+        <div id="toolbar">
+          <form id="changelist-search" method="get" role="search">
+            <label for="searchbar">
+              <img src="{% static 'admin/img/search.svg' %}" alt="{% translate 'Search' %}">
+            </label>
+            <input type="text" size="40" name="q" value="{{ cl.query }}" id="searchbar">
+            <input type="submit" value="{% translate 'Search' %}">
+            <button type="button" class="button treenode-button treenode-expand-all">
+              {% trans "Expand All" %}
+            </button>
+            <button type="button" class="button treenode-button treenode-collapse-all">
+              {% trans "Collapse All" %}
+            </button>
+          </form>
+        </div>
+      {% endblock %}
+
+      {# Form with list and actions #}
+      <form id="changelist-form" method="post" {% if cl.formset or action_form %} enctype="multipart/form-data"{% endif %}>
+        {% csrf_token %}
 
-{% block result_list %}
-  {% if action_form and actions_on_top and cl.show_admin_actions %}
-    {% admin_actions %}
-  {% endif %}
+        {% if action_form and actions_on_top and cl.show_admin_actions %}
+          {% admin_actions %}
+        {% endif %}
 
-  {% tree_result_list cl %}
+        {% block result_list %}
+          {% tree_result_list cl %}
+        {% endblock %}
 
-  {% if action_form and actions_on_bottom and cl.show_admin_actions %}
-    {% admin_actions %}
-  {% endif %}
+        {% if action_form and actions_on_bottom and cl.show_admin_actions %}
+          {% admin_actions %}
+        {% endif %}
+
+        {% block pagination %}
+          {{ block.super }}
+        {% endblock %}
+      </form>
+    </div>
+
+    {# 📎 Боковая панель фильтров #}
+    {% block filters %}
+      {{ block.super }}
+    {% endblock %}
+  </div>
+{% endblock %}
 
-{% endblock %}

treenode/templates/treenode/admin/treenode_rows.html

@@ -2,49 +2,45 @@
 
 <div class="results">
   <table id="result_list">
-
-
-<thead>
-  <tr>
-    {% for h in headers %}
-      <th scope="col"{{ h.class_attrib|safe }}>
-        {% if "action-checkbox-column" in h.class_attrib %}
-          <div class="text">
-            <span>
-              <input type="checkbox" id="action-toggle" aria-label="{% translate 'Select all objects on this page for an action' %}">
-            </span>
-          </div>
-          <div class="clear"></div>
-        {% else %}
-          {% if h.sortable %}
-            <div class="sortoptions">
-              {% if h.url_remove %}
-                <a class="sortremove" href="{{ h.url_remove }}" title="{% translate 'Remove from sorting' %}"></a>
-              {% endif %}
-              {% if h.url_toggle %}
-                <a href="{{ h.url_toggle }}" class="toggle {% if h.ascending %}ascending{% else %}descending{% endif %}" title="{% translate 'Toggle sorting' %}"></a>
-              {% endif %}
-            </div>
-          {% else %}
-            <div class="sortoptions"></div>
-          {% endif %}
-
-          <div class="text">
-            {% if h.sortable %}
-              <a href="{{ h.url_primary }}">{{ h.text|safe }}</a>
+    <thead>
+      <tr>
+        {% for h in headers %}
+          <th scope="col"{{ h.class_attrib|safe }}>
+            {% if "action-checkbox-column" in h.class_attrib %}
+              <div class="text">
+                <span>
+                  <input type="checkbox" id="action-toggle" aria-label="{% translate 'Select all objects on this page for an action' %}">
+                </span>
+              </div>
+              <div class="clear"></div>
             {% else %}
-              <a href="#">{{ h.text|safe }}</a>
+              {% if h.sortable %}
+                <div class="sortoptions">
+                  {% if h.url_remove %}
+                    <a class="sortremove" href="{{ h.url_remove }}" title="{% translate 'Remove from sorting' %}"></a>
+                  {% endif %}
+                  {% if h.url_toggle %}
+                    <a href="{{ h.url_toggle }}" class="toggle {% if h.ascending %}ascending{% else %}descending{% endif %}" title="{% translate 'Toggle sorting' %}"></a>
+                  {% endif %}
+                </div>
+              {% else %}
+                <div class="sortoptions"></div>
+              {% endif %}
+              <div class="text">
+                {% if h.sortable %}
+                  <a href="{{ h.url_primary }}">{{ h.text|safe }}</a>
+                {% else %}
+                  <a href="#">{{ h.text|safe }}</a>
+                {% endif %}
+              </div>
+              <div class="clear"></div>
             {% endif %}
-          </div>
-          <div class="clear"></div>
-        {% endif %}
-      </th>
-    {% endfor %}
-  </tr>
-</thead>
+          </th>
+        {% endfor %}
+      </tr>
+    </thead>
 
-
-    <tbody>
+    <tbody id="treenode-table">
       {% for row in rows %}
         <tr {{ row.attrs|safe }}>
           {% for cell in row.cells %}
@@ -53,5 +49,6 @@
         </tr>
       {% endfor %}
     </tbody>
+
   </table>
 </div>

treenode/templatetags/treenode_admin.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 """
-Custon tags for changelist tamplate.
+Custom tags for changelist template.
 
-Version: 3.0.0
+Version: 3.1.0
 Author: Timur Kady
 Email: timurkady@yandex.com
 """
@@ -10,30 +10,73 @@ Email: timurkady@yandex.com
 
 from django import template
 from django.contrib.admin.templatetags import admin_list
+from django.utils.html import format_html, mark_safe
 
 register = template.Library()
 
 
-@register.inclusion_tag(
-    "treenode/admin/treenode_rows.html",
-    takes_context=True,
-)
+@register.inclusion_tag("treenode/admin/treenode_rows.html", takes_context=True)
 def tree_result_list(context, cl):
-    """
-    Return custom results for change_list.
-
-    Заголовки берём из стандартного admin_list.result_headers(),
-    а строки формируем как угодно.
-    """
+    """Get result list."""
     headers = list(admin_list.result_headers(cl))
 
+    # Add a checkbox title manually if it is missing
+    if cl.actions and not any("action-checkbox-column" in h["class_attrib"] for h in headers):
+        headers.insert(0, {
+            "text": "",
+            "class_attrib": ' class="action-checkbox-column"',
+            "sortable": False
+        })
+
     rows = []
+
     for obj in cl.result_list:
         cells = list(admin_list.items_for_result(cl, obj, None))
+
+        # Insert checkbox manually
+        checkbox = format_html(
+            '<td class="action-checkbox">'
+            '<input type="checkbox" name="_selected_action" value="{}" class="action-select" /></td>',
+            obj.pk
+        )
+        cells.insert(0, checkbox)
+
+        # Replace the toggle cell (3rd after inserting checkbox and move)
+        is_leaf = getattr(obj, "is_leaf", lambda: True)()
+        toggle_html = format_html(
+            '<td class="field-toggle">{}</td>',
+            format_html(
+                '<button class="treenode-toggle" data-node-id="{}">►</button>',
+                obj.pk
+            ) if not is_leaf else mark_safe('<div class="treenode-space">&nbsp;</div>')
+        )
+        if len(cells) >= 3:
+            cells.pop(2)
+        cells.insert(2, toggle_html)
+
+        depth = getattr(obj, "get_depth", lambda: 0)()
+        parent_id = getattr(obj, "parent_id", "")
+        is_root = not parent_id
+
+        classes = ["treenode-row"]
+        if is_root:
+            classes.append("treenode-root")
+        else:
+            classes.append("treenode-hidden")
+
+        row_attrs = {
+            "class": " ".join(classes),
+            "data-node-id": obj.pk,
+            "data-parent-id": parent_id or "",
+            "data-depth": depth,
+        }
+
         rows.append({
-            "attrs": getattr(obj, "row_attrs", ""),
+            "attrs": " ".join(f'{k}="{v}"' for k, v in row_attrs.items()),
             "cells": cells,
-            "form": None,   # поддержка list_editable, если нужно
+            "form": None,
+            "is_leaf": is_leaf,
+            "node_id": obj.pk,
         })
 
     return {

treenode/version.py

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

treenode/views/autoapi.py

@@ -1,91 +1,91 @@
-# -*- coding: utf-8 -*-
-"""
-Route generator for all models inherited from TreeNodeModel
-
-Version: 3.0.0
-Author: Timur Kady
-Email: timurkady@yandex.com
-"""
-
-
-from django.apps import apps
-from django.urls import path
-from django.conf import settings
-from django.contrib.auth.decorators import login_required
-
-from ..models import TreeNodeModel
-from .autocomplete import TreeNodeAutocompleteView
-from .children import TreeChildrenView
-from .search import TreeSearchView
-from .crud import TreeNodeBaseAPIView
-
-
-class AutoTreeAPI:
-    """Auto-discover and expose TreeNode-based APIs."""
-
-    def __init__(self, base_view=TreeNodeBaseAPIView, base_url="api"):
-        """Init auto-discover."""
-        self.base_view = base_view
-        self.base_url = base_url
-
-    def protect_view(self, view, model):
-        """
-        Protect view.
-
-        Protects view with login_required if needed, based on model attribute
-        or global settings.
-        """
-        if getattr(model, 'api_login_required', None) is True:
-            return login_required(view)
-        if getattr(settings, 'TREENODE_API_LOGIN_REQUIRED', False):
-            return login_required(view)
-        return view
-
-    def discover(self):
-        """Scan models and generate API urls."""
-        urls = [
-            # Admin and Widget end-points
-            path("widget/autocomplete/", TreeNodeAutocompleteView.as_view(), name="tree_autocomplete"),  # noqa: D501
-            path("widget/children/", TreeChildrenView.as_view(), name="tree_children"),  # noqa: D501
-            path("widget/search/", TreeSearchView.as_view(), name="tree_search"),  # noqa: D501
-        ]
-        for model in apps.get_models():
-            if issubclass(model, TreeNodeModel) and model is not TreeNodeModel:
-                model_name = model._meta.model_name
-
-                # Dynamically create an API view class for the model
-                api_view_class = type(
-                    f"{model_name.capitalize()}APIView",
-                    (self.base_view,),
-                    {"model": model}
-                )
-
-                # List of API actions and their corresponding URL patterns
-                action_patterns = [
-                    # List / Create
-                    ("", None, f"{model_name}-list"),
-                    # Retrieve / Update / Delete
-                    ("<int:pk>/", None, f"{model_name}-detail"),
-                    ("tree/", {'action': 'tree'}, f"{model_name}-tree"),
-                    # Direct children
-                    ("<int:pk>/children/", {'action': 'children'}, f"{model_name}-children"),  # noqa: D501
-                    # All descendants
-                    ("<int:pk>/descendants/", {'action': 'descendants'}, f"{model_name}-descendants"),   # noqa: D501
-                    # Ancestors + Self + Descendants
-                    ("<int:pk>/family/", {'action': 'family'}, f"{model_name}-family"),   # noqa: D501
-                ]
-
-                # Create secured view instance once
-                view = self.protect_view(api_view_class.as_view(), model)
-
-                # Automatically build all paths for this model
-                for url_suffix, extra_kwargs, route_name in action_patterns:
-                    urls.append(
-                        path(
-                            f"{self.base_url}/{model_name}/{url_suffix}",
-                            view,
-                            extra_kwargs or {},
-                            name=route_name
-                        )
-                    )
-        return urls
+# -*- coding: utf-8 -*-
+"""
+Route generator for all models inherited from TreeNodeModel
+
+Version: 3.0.0
+Author: Timur Kady
+Email: timurkady@yandex.com
+"""
+
+
+from django.apps import apps
+from django.urls import path
+from django.conf import settings
+from django.contrib.auth.decorators import login_required
+
+from ..models import TreeNodeModel
+from .autocomplete import TreeNodeAutocompleteView
+from .children import TreeChildrenView
+from .search import TreeSearchView
+from .crud import TreeNodeBaseAPIView
+
+
+class AutoTreeAPI:
+    """Auto-discover and expose TreeNode-based APIs."""
+
+    def __init__(self, base_view=TreeNodeBaseAPIView, base_url="api"):
+        """Init auto-discover."""
+        self.base_view = base_view
+        self.base_url = base_url
+
+    def protect_view(self, view, model):
+        """
+        Protect view.
+
+        Protects view with login_required if needed, based on model attribute
+        or global settings.
+        """
+        if getattr(model, 'api_login_required', None) is True:
+            return login_required(view)
+        if getattr(settings, 'TREENODE_API_LOGIN_REQUIRED', False):
+            return login_required(view)
+        return view
+
+    def discover(self):
+        """Scan models and generate API urls."""
+        urls = [
+            # Admin and Widget end-points
+            path("widget/autocomplete/", TreeNodeAutocompleteView.as_view(), name="tree_autocomplete"),  # noqa: D501
+            path("widget/children/", TreeChildrenView.as_view(), name="tree_children"),  # noqa: D501
+            path("widget/search/", TreeSearchView.as_view(), name="tree_search"),  # noqa: D501
+        ]
+        for model in apps.get_models():
+            if issubclass(model, TreeNodeModel) and model is not TreeNodeModel:
+                model_name = model._meta.model_name
+
+                # Dynamically create an API view class for the model
+                api_view_class = type(
+                    f"{model_name.capitalize()}APIView",
+                    (self.base_view,),
+                    {"model": model}
+                )
+
+                # List of API actions and their corresponding URL patterns
+                action_patterns = [
+                    # List / Create
+                    ("", None, f"{model_name}-list"),
+                    # Retrieve / Update / Delete
+                    ("<int:pk>/", None, f"{model_name}-detail"),
+                    ("tree/", {'action': 'tree'}, f"{model_name}-tree"),
+                    # Direct children
+                    ("<int:pk>/children/", {'action': 'children'}, f"{model_name}-children"),  # noqa: D501
+                    # All descendants
+                    ("<int:pk>/descendants/", {'action': 'descendants'}, f"{model_name}-descendants"),   # noqa: D501
+                    # Ancestors + Self + Descendants
+                    ("<int:pk>/family/", {'action': 'family'}, f"{model_name}-family"),   # noqa: D501
+                ]
+
+                # Create secured view instance once
+                view = self.protect_view(api_view_class.as_view(), model)
+
+                # Automatically build all paths for this model
+                for url_suffix, extra_kwargs, route_name in action_patterns:
+                    urls.append(
+                        path(
+                            f"{self.base_url}/{model_name}/{url_suffix}",
+                            view,
+                            extra_kwargs or {},
+                            name=route_name
+                        )
+                    )
+        return urls

treenode/views/autocomplete.py

@@ -1,52 +1,52 @@
-# -*- coding: utf-8 -*-
-"""
-
-
-Handles autocomplete suggestions for TreeNode models.
-
-Version: 3.0.0
-Author: Timur Kady
-Email: timurkady@yandex.com
-"""
-
-# autocomplete.py
-from django.http import JsonResponse
-from django.views import View
-from django.contrib.admin.views.decorators import staff_member_required
-from django.utils.decorators import method_decorator
-
-from .common import get_model_from_request
-
-
-@method_decorator(staff_member_required, name='dispatch')
-class TreeNodeAutocompleteView(View):
-    """Widget Autocomplete View."""
-
-    def get(self, request, *args, **kwargs):
-        """Get request."""
-        select_id = request.GET.get("select_id", "").strip()
-        q = request.GET.get("q", "").strip()
-
-        model = get_model_from_request(request)
-        results = []
-
-        if q:
-            field = getattr(model, "display_field", "id")
-            queryset = model.objects.filter(**{f"{field}__icontains": q})
-        elif select_id:
-            pk = int(select_id)
-            queryset = model.objects.filter(pk=pk)
-        else:
-            queryset = model.objects.filter(parent__isnull=True)
-
-        results = [
-            {
-                "id": obj.pk,
-                "text": str(obj),
-                "level": obj.get_depth(),
-                "is_leaf": obj.is_leaf(),
-            }
-            for obj in queryset[:20]
-        ]
-
-        return JsonResponse({"results": results})
+# -*- coding: utf-8 -*-
+"""
+
+
+Handles autocomplete suggestions for TreeNode models.
+
+Version: 3.0.0
+Author: Timur Kady
+Email: timurkady@yandex.com
+"""
+
+# autocomplete.py
+from django.http import JsonResponse
+from django.views import View
+from django.contrib.admin.views.decorators import staff_member_required
+from django.utils.decorators import method_decorator
+
+from .common import get_model_from_request
+
+
+@method_decorator(staff_member_required, name='dispatch')
+class TreeNodeAutocompleteView(View):
+    """Widget Autocomplete View."""
+
+    def get(self, request, *args, **kwargs):
+        """Get request."""
+        select_id = request.GET.get("select_id", "").strip()
+        q = request.GET.get("q", "").strip()
+
+        model = get_model_from_request(request)
+        results = []
+
+        if q:
+            field = getattr(model, "display_field", "id")
+            queryset = model.objects.filter(**{f"{field}__icontains": q})
+        elif select_id:
+            pk = int(select_id)
+            queryset = model.objects.filter(pk=pk)
+        else:
+            queryset = model.objects.filter(parent__isnull=True)
+
+        results = [
+            {
+                "id": obj.pk,
+                "text": str(obj),
+                "level": obj.get_depth(),
+                "is_leaf": obj.is_leaf(),
+            }
+            for obj in queryset[:20]
+        ]
+
+        return JsonResponse({"results": results})

treenode/views/children.py

@@ -1,41 +1,41 @@
-# -*- coding: utf-8 -*-
-"""
-
-Version: 3.0.0
-Author: Timur Kady
-Email: timurkady@yandex.com
-"""
-
-from django.http import JsonResponse
-from django.views import View
-from django.contrib.admin.views.decorators import staff_member_required
-from django.utils.decorators import method_decorator
-
-from .common import get_model_from_request
-
-
-@method_decorator(staff_member_required, name='dispatch')
-class TreeChildrenView(View):
-    def get(self, request, *args, **kwargs):
-        model = get_model_from_request(request)
-        reference_id = request.GET.get("reference_id")
-        if not reference_id:
-            return JsonResponse({"results": []})
-
-        obj = model.objects.filter(pk=reference_id).first()
-        if not obj or obj.is_leaf():
-            return JsonResponse({"results": []})
-
-        results = [
-            {
-                "id": node.pk,
-                "text": str(node),
-                "level": node.get_depth(),
-                "is_leaf": node.is_leaf(),
-            }
-            for node in obj.get_children()
-        ]
-        return JsonResponse({"results": results})
-
-
-# The End
+# -*- coding: utf-8 -*-
+"""
+
+Version: 3.0.0
+Author: Timur Kady
+Email: timurkady@yandex.com
+"""
+
+from django.http import JsonResponse
+from django.views import View
+from django.contrib.admin.views.decorators import staff_member_required
+from django.utils.decorators import method_decorator
+
+from .common import get_model_from_request
+
+
+@method_decorator(staff_member_required, name='dispatch')
+class TreeChildrenView(View):
+    def get(self, request, *args, **kwargs):
+        model = get_model_from_request(request)
+        reference_id = request.GET.get("reference_id")
+        if not reference_id:
+            return JsonResponse({"results": []})
+
+        obj = model.objects.filter(pk=reference_id).first()
+        if not obj or obj.is_leaf():
+            return JsonResponse({"results": []})
+
+        results = [
+            {
+                "id": node.pk,
+                "text": str(node),
+                "level": node.get_depth(),
+                "is_leaf": node.is_leaf(),
+            }
+            for node in obj.get_children()
+        ]
+        return JsonResponse({"results": results})
+
+
+# The End