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

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-fast-treenode
-Version: 3.0.4
+Version: 3.0.6
 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.4 → django_fast_treenode-3.0.6}/django_fast_treenode.egg-info/SOURCES.txt

@@ -93,12 +93,15 @@ treenode/static/vendors/jquery-ui/images/ui-icons_777777_256x240.png
 treenode/static/vendors/jquery-ui/images/ui-icons_cc0000_256x240.png
 treenode/static/vendors/jquery-ui/images/ui-icons_ffffff_256x240.png
 treenode/templates/.gitkeep
-treenode/templates/admin/.gitkeep
-treenode/templates/admin/treenode_ajax_rows.html
-treenode/templates/admin/treenode_changelist.html
-treenode/templates/admin/treenode_import_export.html
-treenode/templates/admin/treenode_rows.html
-treenode/templates/widgets/tree_widget.html
+treenode/templates/treenode/.gitkeep
+treenode/templates/treenode/admin/.gitkeep
+treenode/templates/treenode/admin/treenode_ajax_rows.html
+treenode/templates/treenode/admin/treenode_changelist.html
+treenode/templates/treenode/admin/treenode_import_export.html
+treenode/templates/treenode/admin/treenode_rows.html
+treenode/templates/treenode/widgets/tree_widget.html
+treenode/templatetags/__init__.py
+treenode/templatetags/treenode_admin.py
 treenode/utils/__init__.py
 treenode/utils/db/__init__.py
 treenode/utils/db/compiler.py

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

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

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='django-fast-treenode',
-    version='3.0.4',
+    version='3.0.6',
     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.4 → django_fast_treenode-3.0.6}/treenode/admin/admin.py

@@ -46,7 +46,7 @@ class TreeNodeModelAdmin(AdminMixin, admin.ModelAdmin):
         models.ForeignKey: {'widget': TreeWidget()},
     }
 
-    change_list_template = "admin/treenode_changelist.html"
+    change_list_template = "treenode/admin/treenode_changelist.html"
     import_export = True
 
     class Media:
@@ -184,6 +184,7 @@ class TreeNodeModelAdmin(AdminMixin, admin.ModelAdmin):
     def changelist_view(self, request, extra_context=None):
         """Changelist View."""
         extra_context = extra_context or {}
+        # TODO
         extra_context['import_export_enabled'] = self.import_export
         extra_context['num_sorted_fields'] = len(self.get_ordering(request) or [])  # noqa: D501
 

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

@@ -84,7 +84,7 @@ class AdminMixin(admin.ModelAdmin):
                     value = field(obj)
                     field_name = getattr(field, "__name__", "field")
                 else:
-                    r, attr, value = lookup_field(field, obj, self)
+                    attr, value = lookup_field(field, obj, self)
                     field_name = field
 
                 row_data.append(value)
@@ -154,7 +154,7 @@ class AdminMixin(admin.ModelAdmin):
 
         # Render HTML
         html = render_to_string(
-            "admin/treenode_ajax_rows.html",
+            "treenode/admin/treenode_ajax_rows.html",
             {"rows": rows},
             request=request
         )

django_fast_treenode-3.0.6/treenode/templates/treenode/admin/.gitkeep

@@ -0,0 +1 @@
+

django_fast_treenode-3.0.6/treenode/templatetags/treenode_admin.py

@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+"""
+Custon tags for changelist tamplate.
+
+Version: 3.0.0
+Author: Timur Kady
+Email: timurkady@yandex.com
+"""
+
+
+from django import template
+from django.contrib.admin.templatetags import admin_list
+
+register = template.Library()
+
+
+@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(),
+    а строки формируем как угодно.
+    """
+    headers = list(admin_list.result_headers(cl))
+
+    rows = []
+    for obj in cl.result_list:
+        cells = list(admin_list.items_for_result(cl, obj, None))
+        rows.append({
+            "attrs": getattr(obj, "row_attrs", ""),
+            "cells": cells,
+            "form": None,   # поддержка list_editable, если нужно
+        })
+
+    return {
+        **context.flatten(),
+        "headers": headers,
+        "rows": rows,
+        "num_sorted_fields": sum(
+            1 for h in headers if h["sortable"] and h["sorted"]
+        ),
+    }

{django_fast_treenode-3.0.4 → django_fast_treenode-3.0.6}/treenode/version.py

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