From a6634a2c8e586f69d6f5b2ff39cce503487d1168 Mon Sep 17 00:00:00 2001 From: Brian Tiemann Date: Wed, 18 Sep 2024 18:28:51 -0400 Subject: [PATCH 1/4] Ensure model is defined when rendering bulk_edit_button --- netbox/templates/htmx/table.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox/templates/htmx/table.html b/netbox/templates/htmx/table.html index 5728789faee..171107c34cc 100644 --- a/netbox/templates/htmx/table.html +++ b/netbox/templates/htmx/table.html @@ -15,7 +15,7 @@ {% endwith %} -{% if request.htmx %} +{% if request.htmx and model %} {# Include the updated object count for display elsewhere on the page #}
{{ table.rows|length }}
From 8940732a86d8e68e60f7606309da286182513e2d Mon Sep 17 00:00:00 2001 From: Brian Tiemann Date: Wed, 18 Sep 2024 18:44:48 -0400 Subject: [PATCH 2/4] Move model check to inner conditional --- netbox/templates/htmx/table.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/netbox/templates/htmx/table.html b/netbox/templates/htmx/table.html index 171107c34cc..4bce37105cc 100644 --- a/netbox/templates/htmx/table.html +++ b/netbox/templates/htmx/table.html @@ -15,12 +15,12 @@ {% endwith %} -{% if request.htmx and model %} +{% if request.htmx %} {# Include the updated object count for display elsewhere on the page #}
{{ table.rows|length }}
{# Update the bulk action buttons with new query parameters #} - {% if actions %} + {% if actions and model %}
{% if 'bulk_edit' in actions %} {% bulk_edit_button model query_params=request.GET %} From 485d3aee3757547b864f733f01fb3c2fc174e8e2 Mon Sep 17 00:00:00 2001 From: Brian Tiemann Date: Thu, 19 Sep 2024 14:24:07 -0400 Subject: [PATCH 3/4] Set model in context --- netbox/netbox/views/generic/object_views.py | 3 +++ netbox/templates/htmx/table.html | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/netbox/netbox/views/generic/object_views.py b/netbox/netbox/views/generic/object_views.py index 35726452205..95b59914533 100644 --- a/netbox/netbox/views/generic/object_views.py +++ b/netbox/netbox/views/generic/object_views.py @@ -129,6 +129,7 @@ def get(self, request, *args, **kwargs): GET handler for rendering child objects. """ instance = self.get_object(**kwargs) + model = self.queryset.model child_objects = self.get_children(request, instance) if self.filterset: @@ -146,10 +147,12 @@ def get(self, request, *args, **kwargs): return render(request, 'htmx/table.html', { 'object': instance, 'table': table, + 'model': model, }) return render(request, self.get_template_name(), { 'object': instance, + 'model': model, 'child_model': self.child_model, 'base_template': f'{instance._meta.app_label}/{instance._meta.model_name}.html', 'table': table, diff --git a/netbox/templates/htmx/table.html b/netbox/templates/htmx/table.html index 4bce37105cc..5728789faee 100644 --- a/netbox/templates/htmx/table.html +++ b/netbox/templates/htmx/table.html @@ -20,7 +20,7 @@
{{ table.rows|length }}
{# Update the bulk action buttons with new query parameters #} - {% if actions and model %} + {% if actions %}
{% if 'bulk_edit' in actions %} {% bulk_edit_button model query_params=request.GET %} From c5966be13b747bbe5e8b4bddb857971362dfee2a Mon Sep 17 00:00:00 2001 From: Brian Tiemann Date: Tue, 24 Sep 2024 11:29:43 -0400 Subject: [PATCH 4/4] Return child_model instead of model for use in bulk_edit_button --- netbox/netbox/views/generic/object_views.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/netbox/netbox/views/generic/object_views.py b/netbox/netbox/views/generic/object_views.py index 95b59914533..0686e52b7df 100644 --- a/netbox/netbox/views/generic/object_views.py +++ b/netbox/netbox/views/generic/object_views.py @@ -129,7 +129,6 @@ def get(self, request, *args, **kwargs): GET handler for rendering child objects. """ instance = self.get_object(**kwargs) - model = self.queryset.model child_objects = self.get_children(request, instance) if self.filterset: @@ -147,12 +146,12 @@ def get(self, request, *args, **kwargs): return render(request, 'htmx/table.html', { 'object': instance, 'table': table, - 'model': model, + 'model': self.child_model, }) return render(request, self.get_template_name(), { 'object': instance, - 'model': model, + 'model': self.child_model, 'child_model': self.child_model, 'base_template': f'{instance._meta.app_label}/{instance._meta.model_name}.html', 'table': table,