diff --git a/netbox/circuits/forms/bulk_import.py b/netbox/circuits/forms/bulk_import.py index ddc100af6..1ceb44b60 100644 --- a/netbox/circuits/forms/bulk_import.py +++ b/netbox/circuits/forms/bulk_import.py @@ -1,11 +1,10 @@ from django import forms - -from circuits.choices import CircuitStatusChoices, CircuitTerminationSideChoices -from circuits.models import * -from circuits.choices import * -from dcim.models import Site from django.utils.safestring import mark_safe from django.utils.translation import gettext_lazy as _ + +from circuits.choices import * +from circuits.models import * +from dcim.models import Site from netbox.forms import NetBoxModelImportForm from tenancy.models import Tenant from utilities.forms.fields import CSVChoiceField, CSVModelChoiceField, SlugField diff --git a/netbox/circuits/views.py b/netbox/circuits/views.py index c46a7e689..def9a3640 100644 --- a/netbox/circuits/views.py +++ b/netbox/circuits/views.py @@ -409,7 +409,7 @@ class CircuitContactsView(ObjectContactsView): # class CircuitTerminationListView(generic.ObjectListView): - queryset = CircuitTermination.objects.prefetch_related('circuit') + queryset = CircuitTermination.objects.all() filterset = filtersets.CircuitTerminationFilterSet filterset_form = forms.CircuitTerminationFilterForm table = tables.CircuitTerminationTable @@ -417,7 +417,7 @@ class CircuitTerminationListView(generic.ObjectListView): @register_model_view(CircuitTermination) class CircuitTerminationView(generic.ObjectView): - queryset = CircuitTermination.objects.prefetch_related('circuit') + queryset = CircuitTermination.objects.all() @register_model_view(CircuitTermination, 'edit') diff --git a/netbox/templates/circuits/circuittermination.html b/netbox/templates/circuits/circuittermination.html index 7a155073a..d74d2c636 100644 --- a/netbox/templates/circuits/circuittermination.html +++ b/netbox/templates/circuits/circuittermination.html @@ -22,7 +22,7 @@