From e0db49f98151aae71e0ee68ede62ded000f4bdad Mon Sep 17 00:00:00 2001 From: Arthur Hanson Date: Mon, 21 Oct 2024 15:18:25 -0700 Subject: [PATCH] 9604 fix tests --- netbox/circuits/views.py | 6 +++--- netbox/dcim/graphql/types.py | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/netbox/circuits/views.py b/netbox/circuits/views.py index 8218960c9..6eebb05eb 100644 --- a/netbox/circuits/views.py +++ b/netbox/circuits/views.py @@ -257,7 +257,7 @@ class CircuitTypeBulkDeleteView(generic.BulkDeleteView): class CircuitListView(generic.ObjectListView): queryset = Circuit.objects.prefetch_related( - 'tenant__group', 'termination_a__site', 'termination_z__site', + 'tenant__group', 'termination_a___site', 'termination_z___site', 'termination_a__provider_network', 'termination_z__provider_network', ) filterset = filtersets.CircuitFilterSet @@ -298,7 +298,7 @@ class CircuitBulkImportView(generic.BulkImportView): class CircuitBulkEditView(generic.BulkEditView): queryset = Circuit.objects.prefetch_related( - 'termination_a__site', 'termination_z__site', + 'termination_a___site', 'termination_z___site', 'termination_a__provider_network', 'termination_z__provider_network', ) filterset = filtersets.CircuitFilterSet @@ -308,7 +308,7 @@ class CircuitBulkEditView(generic.BulkEditView): class CircuitBulkDeleteView(generic.BulkDeleteView): queryset = Circuit.objects.prefetch_related( - 'termination_a__site', 'termination_z__site', + 'termination_a___site', 'termination_z___site', 'termination_a__provider_network', 'termination_z__provider_network', ) filterset = filtersets.CircuitFilterSet diff --git a/netbox/dcim/graphql/types.py b/netbox/dcim/graphql/types.py index cd863837a..6f7140f5a 100644 --- a/netbox/dcim/graphql/types.py +++ b/netbox/dcim/graphql/types.py @@ -725,10 +725,13 @@ class SiteType(VLANGroupsMixin, ImageAttachmentsMixin, ContactsMixin, NetBoxObje devices: List[Annotated["DeviceType", strawberry.lazy('dcim.graphql.types')]] locations: List[Annotated["LocationType", strawberry.lazy('dcim.graphql.types')]] asns: List[Annotated["ASNType", strawberry.lazy('ipam.graphql.types')]] - circuit_terminations: List[Annotated["CircuitTerminationType", strawberry.lazy('circuits.graphql.types')]] clusters: List[Annotated["ClusterType", strawberry.lazy('virtualization.graphql.types')]] vlans: List[Annotated["VLANType", strawberry.lazy('ipam.graphql.types')]] + @strawberry_django.field + def circuit_terminations(self) -> List[Annotated["CircuitTerminationType", strawberry.lazy('circuits.graphql.types')]]: + return self._circuit_terminations.all() + @strawberry_django.type( models.SiteGroup,