mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

15496 review changes

Browse Source
This commit is contained in:
Arthur
2024-05-09 10:38:11 -07:00
parent 3ce804726a
commit 0e39585b34
3 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
netbox/circuits/forms/bulk_edit.py
View File

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

10
netbox/circuits/forms/filtersets.py
View File

@ -196,16 +196,6 @@ class CircuitTerminationFilterForm(NetBoxModelFilterSetForm):
FieldSet('circuit_id', 'term_side', name=_('Circuit')), FieldSet('circuit_id', 'term_side', name=_('Circuit')),
FieldSet('region_id', 'site_group_id', 'site_id', name=_('Location')), 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( site_id = DynamicModelMultipleChoiceField(
queryset=Site.objects.all(), queryset=Site.objects.all(),
required=False, required=False,

9
netbox/circuits/tables/circuits.py
View File

@ -96,6 +96,11 @@ class CircuitTerminationTable(NetBoxTable):
verbose_name=_('Circuit'), verbose_name=_('Circuit'),
linkify=True linkify=True
) )
circuit_provider = tables.Column(
verbose_name=_('Circuit Provider'),
linkify=True,
accessor='circuit.provider'
)
site = tables.Column( site = tables.Column(
verbose_name=_('Site'), verbose_name=_('Site'),
linkify=True linkify=True
@ -108,7 +113,7 @@ class CircuitTerminationTable(NetBoxTable):
class Meta(NetBoxTable.Meta): class Meta(NetBoxTable.Meta):
model = CircuitTermination model = CircuitTermination
fields = ( 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', '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')