Misc cleanup

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

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')

netbox/templates/circuits/circuittermination.html

@@ -22,7 +22,7 @@
                     </td>
                   </tr>
                   <tr>
-                    <th scope="row">{% trans "Circuit Provider" %}</th>
+                    <th scope="row">{% trans "Provider" %}</th>
                     <td>
                       {{ object.circuit.provider|linkify }}
                     </td>