django-fast-treenode 3.0.4__py3-none-any.whl → 3.0.6__py3-none-any.whl

{django_fast_treenode-3.0.4.dist-info → django_fast_treenode-3.0.6.dist-info}/METADATA

@@ -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.dist-info → django_fast_treenode-3.0.6.dist-info}/RECORD

@@ -1,4 +1,4 @@
-django_fast_treenode-3.0.4.dist-info/licenses/LICENSE,sha256=SSYqS84FCnAW7tAxmjBKU8qAa8Jv4VGPuSSGeHwWtJE,1095
+django_fast_treenode-3.0.6.dist-info/licenses/LICENSE,sha256=SSYqS84FCnAW7tAxmjBKU8qAa8Jv4VGPuSSGeHwWtJE,1095
 treenode/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 treenode/apps.py,sha256=QlwjNDM9rkUoWB8Vm8-OkS6lNx0-aTByuGZlu9wrQMs,1832
 treenode/cache.py,sha256=2jUiiecfFxwB7QFukpU4u0FnDzGH6hNRfo6KAYvs6vM,8447
@@ -7,14 +7,14 @@ treenode/settings.py,sha256=oSkcKXNVd28HXrlWZIH2VYinCMq-UdCDlX4KD0Qc_Xk,631
 treenode/signals.py,sha256=ERrlKjGqhYaPYVKKRk1JBBlPFOmJKpJ6bXsJavcTlo0,518
 treenode/tests.py,sha256=2uDafv3Ns6f7Vy1ekUtgYxCZEi1KRyesZDTAFhYcX-E,63
 treenode/urls.py,sha256=krHvVigc_dxC0z5hEd2rgeH6th8jW7qJY3Qbia-419Y,240
-treenode/version.py,sha256=agtMVvI22kmKiOiAyXlZeP14ej675T1Yd8F0FzHfXXk,220
+treenode/version.py,sha256=AVU54ETwjuKnFIx-aNjKEDEPQRV3Odz7S2YywkIjue8,220
 treenode/widgets.py,sha256=61ed16bVqb1_R97jekDrbKS5pDVK4nzXSDwL3CDBYEk,4075
 treenode/admin/__init__.py,sha256=XNEYHdF5lKb0vpdlVxdR2fxj5oUgzyx1YyCwsv0gxHw,100
-treenode/admin/admin.py,sha256=9_GC6JjWRiG_G84royRGAr10BSNIAj4N_33JXdzP8IY,7733
+treenode/admin/admin.py,sha256=UvO8EuABgXMG3EjkNjPhlL1yWp55JIwN85iOr8pHZ9I,7758
 treenode/admin/changelist.py,sha256=KUYS9MaR8Ck_1xmMqupobxWKarrJEqmHuEG32CL01Bo,1662
 treenode/admin/exporter.py,sha256=QE74V6W3tvwA5kCvBt1MmVlLOaWh-o8EU63cgmiwD5Q,5724
 treenode/admin/importer.py,sha256=hK3D-1DZcoowGblRluGzng3n5Bf__hMsbNaIGXRpRdg,6263
-treenode/admin/mixin.py,sha256=o83zTETOjvdHRjGR2pGthsY_RO7GVEimNUISgqqOBLs,10642
+treenode/admin/mixin.py,sha256=ssOfk6xJ8BculZrVRFUoHpNOr4jK9CUkcKnqzqyd5kM,10648
 treenode/managers/__init__.py,sha256=c7F9Ku9489Hv6lTpUY2nbyBlWFCXBWAkNBm4xTKcjL8,186
 treenode/managers/managers.py,sha256=8OaFxtajyR1d7-UHyiUbifMBEF9cjfHTIEYPkYUWmt0,7166
 treenode/managers/queries.py,sha256=zZYeDVFXl-Hro9ubv0_zuN7XaVXQhyeeFx_GVZSMi30,10273
@@ -64,12 +64,15 @@ treenode/static/vendors/jquery-ui/images/ui-icons_777777_256x240.png,sha256=TLer
 treenode/static/vendors/jquery-ui/images/ui-icons_cc0000_256x240.png,sha256=S36ETnNcCxoWxmxAkVl0P3LYEDInjxi9GnG_g5uho1c,4615
 treenode/static/vendors/jquery-ui/images/ui-icons_ffffff_256x240.png,sha256=SBgnaQEkoyko7AbSFy0lDoDzAup6bkVQ74XyenFleUM,6395
 treenode/templates/.gitkeep,sha256=frcCV1k9oG9oKj3dpUqdJg1PxRT2RSN_XKdLCPjaYaY,2
-treenode/templates/admin/.gitkeep,sha256=frcCV1k9oG9oKj3dpUqdJg1PxRT2RSN_XKdLCPjaYaY,2
-treenode/templates/admin/treenode_ajax_rows.html,sha256=zFyPaTbSyxRjOqQ85SMv__qTIYDjEna6chYODBypDZA,224
-treenode/templates/admin/treenode_changelist.html,sha256=ALU8iZLCOIiiGIf5RTdv3Bb694pG_YyQ-wcbz1CkBKc,654
-treenode/templates/admin/treenode_import_export.html,sha256=K6L_JnhGpWgQdduXSfAJ0UuTBfSN4ylFw9w_e5tPDDE,2926
-treenode/templates/admin/treenode_rows.html,sha256=S1XtZXWMUdfgjDoKG7OJwZg81a_5IKPp7tyrrHhJbBk,1695
-treenode/templates/widgets/tree_widget.html,sha256=GKcCU-B2FkkJ2BSOuXOw9e_PdYTtADcvyITEXqOlZ9Y,723
+treenode/templates/treenode/.gitkeep,sha256=frcCV1k9oG9oKj3dpUqdJg1PxRT2RSN_XKdLCPjaYaY,2
+treenode/templates/treenode/admin/.gitkeep,sha256=frcCV1k9oG9oKj3dpUqdJg1PxRT2RSN_XKdLCPjaYaY,2
+treenode/templates/treenode/admin/treenode_ajax_rows.html,sha256=zFyPaTbSyxRjOqQ85SMv__qTIYDjEna6chYODBypDZA,224
+treenode/templates/treenode/admin/treenode_changelist.html,sha256=ALU8iZLCOIiiGIf5RTdv3Bb694pG_YyQ-wcbz1CkBKc,654
+treenode/templates/treenode/admin/treenode_import_export.html,sha256=K6L_JnhGpWgQdduXSfAJ0UuTBfSN4ylFw9w_e5tPDDE,2926
+treenode/templates/treenode/admin/treenode_rows.html,sha256=S1XtZXWMUdfgjDoKG7OJwZg81a_5IKPp7tyrrHhJbBk,1695
+treenode/templates/treenode/widgets/tree_widget.html,sha256=GKcCU-B2FkkJ2BSOuXOw9e_PdYTtADcvyITEXqOlZ9Y,723
+treenode/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+treenode/templatetags/treenode_admin.py,sha256=0Xz5tS_Etf2FU69Ww7GfQ6u2_jh97jymD1Gc4XCpHbc,1204
 treenode/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 treenode/utils/db/__init__.py,sha256=RwicAcJSI1nhIPWLdT7j9TFsgOc9834VDn9lVn54GlY,247
 treenode/utils/db/compiler.py,sha256=PgD9ybS5H8OUHw1gkFBQHhnrf5HiCx8QXUMRhydwh7o,3824
@@ -84,7 +87,7 @@ treenode/views/children.py,sha256=bygXaEBExxG3zIPL34_PYHLFFIqlQU2naqPIlyQ6e-s,11
 treenode/views/common.py,sha256=mrmr40R91XVbMWcz5GZT-OjpnQ87F7XQZxu1W6rqpqI,617
 treenode/views/crud.py,sha256=RI5rdyD4hZTszjZFThByxi_lkAeJlqbDCXFkD8iyzKE,7424
 treenode/views/search.py,sha256=c_GyooT3jyoNa96bBxfoWruRN1wIw-ZGYvwGKkGojTs,1501
-django_fast_treenode-3.0.4.dist-info/METADATA,sha256=NbOy_OHnyPjubLhbssbpdM2jwGiModfoiE_CPNvQpM8,10249
-django_fast_treenode-3.0.4.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-django_fast_treenode-3.0.4.dist-info/top_level.txt,sha256=fmgxHbXyx1O2MPi_9kjx8aL9L-8TmV0gre4Go8XgqFk,9
-django_fast_treenode-3.0.4.dist-info/RECORD,,
+django_fast_treenode-3.0.6.dist-info/METADATA,sha256=gWtZYZEHkn5pnEw54QUVz3B_CORzh7HsXx0eQR0sl9Y,10249
+django_fast_treenode-3.0.6.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+django_fast_treenode-3.0.6.dist-info/top_level.txt,sha256=fmgxHbXyx1O2MPi_9kjx8aL9L-8TmV0gre4Go8XgqFk,9
+django_fast_treenode-3.0.6.dist-info/RECORD,,

{django_fast_treenode-3.0.4.dist-info → django_fast_treenode-3.0.6.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.7.1)
+Generator: setuptools (80.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

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
 

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
         )

treenode/templates/treenode/admin/.gitkeep

@@ -0,0 +1 @@
+

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"]
+        ),
+    }

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'