From 6171ce6038d87c9ea61ae2380b522051fff9c92d Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Sat, 13 Jul 2024 10:45:44 -0400 Subject: [PATCH] Remove annotate_vlan_ranges() from VLANGroupQuerySet --- netbox/ipam/querysets.py | 6 ------ netbox/ipam/views.py | 4 ++-- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/netbox/ipam/querysets.py b/netbox/ipam/querysets.py index e490c238b..470b38ab9 100644 --- a/netbox/ipam/querysets.py +++ b/netbox/ipam/querysets.py @@ -66,12 +66,6 @@ class VLANGroupQuerySet(RestrictedQuerySet): utilization=Round(F('vlan_count') * 100 / F('_total_vlan_ids'), 2) ) - def annotate_vlan_ranges(self): - - return self.annotate( - vid_range=Func(F('vlan_id_ranges'), function='unnest') - ) - class VLANQuerySet(RestrictedQuerySet): diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py index 543534982..67d56f15e 100644 --- a/netbox/ipam/views.py +++ b/netbox/ipam/views.py @@ -915,7 +915,7 @@ class IPAddressContactsView(ObjectContactsView): # class VLANGroupListView(generic.ObjectListView): - queryset = VLANGroup.objects.annotate_utilization().annotate_vlan_ranges().prefetch_related('tags') + queryset = VLANGroup.objects.annotate_utilization() filterset = filtersets.VLANGroupFilterSet filterset_form = forms.VLANGroupFilterForm table = tables.VLANGroupTable @@ -923,7 +923,7 @@ class VLANGroupListView(generic.ObjectListView): @register_model_view(VLANGroup) class VLANGroupView(GetRelatedModelsMixin, generic.ObjectView): - queryset = VLANGroup.objects.annotate_utilization().prefetch_related('tags') + queryset = VLANGroup.objects.annotate_utilization() def get_extra_context(self, request, instance): return {