Merge pull request #170 from ArnesSI/tables

update tables to htmx_table macro
ArnesSI · May 13, 2024 · eac15ac · eac15ac
2 parents 14da383 + e0181f0
commit eac15ac
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/netbox_inventory/filtersets.py b/netbox_inventory/filtersets.py
@@ -424,6 +424,12 @@ class InventoryItemGroupFilterSet(NetBoxModelFilterSet):
         queryset=InventoryItemGroup.objects.all(),
         label='Parent group (ID)',
     )
+    ancestor_id = filters.TreeNodeMultipleChoiceFilter(
+        queryset=InventoryItemGroup.objects.all(),
+        field_name='parent',
+        lookup_expr='in',
+        label='Inventory item group (ID)',
+    )
 
     class Meta:
         model = InventoryItemGroup

diff --git a/netbox_inventory/templates/netbox_inventory/delivery.html b/netbox_inventory/templates/netbox_inventory/delivery.html
@@ -1,7 +1,6 @@
 {% extends 'generic/object.html' %}
 {% load helpers %}
 {% load plugins %}
-{% load render_table from django_tables2 %}
 
 {% block breadcrumbs %}
   {{ block.super }}

diff --git a/netbox_inventory/templates/netbox_inventory/inventoryitemgroup.html b/netbox_inventory/templates/netbox_inventory/inventoryitemgroup.html
@@ -1,7 +1,6 @@
 {% extends 'generic/object.html' %}
 {% load helpers %}
 {% load plugins %}
-{% load render_table from django_tables2 %}
 
 {% block breadcrumbs %}
   {{ block.super }}
@@ -116,7 +115,7 @@ <h5 class="card-header">
             </div>
           {% endif %}
         </h5>
-        {% render_table child_groups_table 'inc/table.html' %}
+        {% htmx_table 'plugins:netbox_inventory:inventoryitemgroup_list' ancestor_id=object.pk %}
       </div>
       {% include 'inc/panels/tags.html' %}
       {% include 'inc/panels/comments.html' %}
@@ -127,8 +126,7 @@ <h5 class="card-header">
     <div class="col col-md-12">
       <div class="card">
         <h5 class="card-header">Assets</h5>
-        {% render_table asset_table 'inc/table.html' %}
-        {% include 'inc/paginator.html' with paginator=asset_table.paginator page=asset_table.page %}
+        {% htmx_table 'plugins:netbox_inventory:asset_list' inventoryitem_group_id=object.pk %}
       </div>
       {% plugin_full_width_page object %}
     </div>

diff --git a/netbox_inventory/templates/netbox_inventory/purchase.html b/netbox_inventory/templates/netbox_inventory/purchase.html
@@ -1,7 +1,6 @@
 {% extends 'generic/object.html' %}
 {% load helpers %}
 {% load plugins %}
-{% load render_table from django_tables2 %}
 
 {% block breadcrumbs %}
   {{ block.super }}

diff --git a/netbox_inventory/templates/netbox_inventory/supplier.html b/netbox_inventory/templates/netbox_inventory/supplier.html
@@ -1,6 +1,5 @@
 {% extends 'generic/object.html' %}
 {% load plugins %}
-{% load render_table from django_tables2 %}
 
 {% block breadcrumbs %}
   <li class="breadcrumb-item"><a href="{% url 'plugins:netbox_inventory:supplier_list' %}">Suppliers</a></li>