15496 review changes

netbox/circuits/forms/bulk_edit.py

@@ -198,7 +198,7 @@ class CircuitTerminationBulkEditForm(NetBoxModelBulkEditForm):
     )
     upstream_speed = forms.IntegerField(
         required=False,
-        label=_('upstream speed (Kbps)'),
+        label=_('Upstream speed (Kbps)'),
     )
     mark_connected = forms.NullBooleanField(
         label=_('Mark connected'),

netbox/circuits/forms/filtersets.py

@@ -196,16 +196,6 @@ class CircuitTerminationFilterForm(NetBoxModelFilterSetForm):
         FieldSet('circuit_id', 'term_side', name=_('Circuit')),
         FieldSet('region_id', 'site_group_id', 'site_id', name=_('Location')),
     )
-    region_id = DynamicModelMultipleChoiceField(
-        queryset=Region.objects.all(),
-        required=False,
-        label=_('Region')
-    )
-    site_group_id = DynamicModelMultipleChoiceField(
-        queryset=SiteGroup.objects.all(),
-        required=False,
-        label=_('Site group')
-    )
     site_id = DynamicModelMultipleChoiceField(
         queryset=Site.objects.all(),
         required=False,

netbox/circuits/tables/circuits.py

@@ -96,6 +96,11 @@ class CircuitTerminationTable(NetBoxTable):
         verbose_name=_('Circuit'),
         linkify=True
     )
+    circuit_provider = tables.Column(
+        verbose_name=_('Circuit Provider'),
+        linkify=True,
+        accessor='circuit.provider'
+    )
     site = tables.Column(
         verbose_name=_('Site'),
         linkify=True
@@ -108,7 +113,7 @@ class CircuitTerminationTable(NetBoxTable):
     class Meta(NetBoxTable.Meta):
         model = CircuitTermination
         fields = (
-            'pk', 'id', 'circuit', 'term_side', 'site', 'provider_network', 'port_speed', 'upstream_speed',
+            'pk', 'id', 'circuit', 'circuit_provider', 'term_side', 'site', 'provider_network', 'port_speed', 'upstream_speed',
             'xconnect_id', 'pp_info', 'description', 'created', 'last_updated', 'actions',
         )
-        default_columns = ('pk', 'id', 'circuit', 'term_side', 'description')
+        default_columns = ('pk', 'id', 'circuit', 'circuit_provider', 'term_side', 'description')