From c4d43f3035322bb7a34beca40c445fc362c0abd1 Mon Sep 17 00:00:00 2001 From: dreng Date: Tue, 27 Dec 2022 18:55:59 +0100 Subject: [PATCH 1/2] Added filter badge in rack elevation --- netbox/dcim/views.py | 2 ++ netbox/templates/dcim/rack_elevation_list.html | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index 06a48653478..b0e176a9677 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -652,6 +652,7 @@ def get(self, request): racks = filtersets.RackFilterSet(request.GET, self.queryset).qs total_count = racks.count() + self.model = self.queryset.model # Ordering ORDERING_CHOICES = { @@ -691,6 +692,7 @@ def get(self, request): 'sort_choices': ORDERING_CHOICES, 'rack_face': rack_face, 'filter_form': forms.RackElevationFilterForm(request.GET), + 'model': self.model, }) diff --git a/netbox/templates/dcim/rack_elevation_list.html b/netbox/templates/dcim/rack_elevation_list.html index ef22bd9b8cd..c9d9a248afb 100644 --- a/netbox/templates/dcim/rack_elevation_list.html +++ b/netbox/templates/dcim/rack_elevation_list.html @@ -35,6 +35,10 @@ {% block content-wrapper %}
+ {% if filter_form %} + {% applied_filters model filter_form request.GET %} + {% endif %} + {# Rack elevations #}
{% if page %} From 964d8d38a40ebc213442b5f75154fcf7b5e74e5d Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 28 Dec 2022 16:46:20 -0500 Subject: [PATCH 2/2] Tweak template context --- netbox/dcim/views.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index b0e176a9677..870cbcc18d2 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -652,7 +652,6 @@ def get(self, request): racks = filtersets.RackFilterSet(request.GET, self.queryset).qs total_count = racks.count() - self.model = self.queryset.model # Ordering ORDERING_CHOICES = { @@ -692,7 +691,7 @@ def get(self, request): 'sort_choices': ORDERING_CHOICES, 'rack_face': rack_face, 'filter_form': forms.RackElevationFilterForm(request.GET), - 'model': self.model, + 'model': self.queryset.model, })