From 57397570c08f27148c10a65a00d245147647a33f Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Mon, 11 Jul 2022 12:45:53 -0400 Subject: [PATCH] Drop extraneous/invalid prefetches --- netbox/dcim/views.py | 4 +--- netbox/ipam/views.py | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index a466246f5..ec3e9152e 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -560,9 +560,7 @@ class RackRoleBulkDeleteView(generic.BulkDeleteView): # class RackListView(generic.ObjectListView): - queryset = Rack.objects.prefetch_related( - 'site', 'location', 'tenant', 'tenant_group', 'role', 'devices__device_type' - ).annotate( + queryset = Rack.objects.prefetch_related('devices__device_type').annotate( device_count=count_related(Device, 'rack') ) filterset = filtersets.RackFilterSet diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py index e6b11c427..706670cad 100644 --- a/netbox/ipam/views.py +++ b/netbox/ipam/views.py @@ -586,9 +586,7 @@ class IPRangeIPAddressesView(generic.ObjectChildrenView): template_name = 'ipam/iprange/ip_addresses.html' def get_children(self, request, parent): - return parent.get_child_ips().restrict(request.user, 'view').prefetch_related( - 'vrf', 'role', 'tenant', 'tenant__group', - ) + return parent.get_child_ips().restrict(request.user, 'view') def get_extra_context(self, request, instance): return {