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

Merge branch 'develop' into feature

Browse Source
This commit is contained in:
jeremystretch
2022-12-13 17:17:05 -05:00
parent 2db668f5cc fb27803ab0
commit 064e3ff605
22 changed files with 274 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
netbox/ipam/forms/filtersets.py
View File

@@ -249,7 +249,7 @@ class IPRangeFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
null_option='Global'
)
status = MultipleChoiceField(
choices=PrefixStatusChoices,
choices=IPRangeStatusChoices,
required=False
)
role_id = DynamicModelMultipleChoiceField(

6
netbox/ipam/tables/l2vpn.py
View File

@@ -31,16 +31,16 @@ class L2VPNTable(TenancyColumnsMixin, NetBoxTable):
)
comments = columns.MarkdownColumn()
tags = columns.TagColumn(
url_name='ipam:prefix_list'
url_name='ipam:l2vpn_list'
)
class Meta(NetBoxTable.Meta):
model = L2VPN
fields = (
'pk', 'name', 'slug', 'identifier', 'type', 'import_targets', 'export_targets', 'tenant', 'tenant_group',
'description', 'comments', 'tags', 'created', 'last_updated', 'actions',
'description', 'comments', 'tags', 'created', 'last_updated',
)
default_columns = ('pk', 'name', 'identifier', 'type', 'description', 'actions')
default_columns = ('pk', 'name', 'identifier', 'type', 'description')
class L2VPNTerminationTable(NetBoxTable):