NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-30 12:26:25 -06:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

17929 merge latest scope changes

Browse Source
This commit is contained in:
Arthur Hanson 2024-11-07 08:49:29 -08:00
parent ee274c8451
commit 287a64798d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -204,7 +204,7 @@ class PrefixImportForm(ScopedImportForm, NetBoxModelImportForm):
'mark_utilized', 'description', 'comments', 'tags', 'mark_utilized', 'description', 'comments', 'tags',
) )
labels = { labels = {
'scope_id': 'Scope ID', 'scope_id': _('Scope ID'),
} }
def __init__(self, data=None, *args, **kwargs): def __init__(self, data=None, *args, **kwargs):

2
netbox/wireless/filtersets.py
View File

@ -2,7 +2,7 @@ import django_filters
from django.db.models import Q from django.db.models import Q
from dcim.choices import LinkStatusChoices from dcim.choices import LinkStatusChoices
from dcim.filtersets import ScopedFilterSet from dcim.filterset_mixins import ScopedFilterSet
from dcim.models import Interface from dcim.models import Interface
from ipam.models import VLAN from ipam.models import VLAN
from netbox.filtersets import OrganizationalModelFilterSet, NetBoxModelFilterSet from netbox.filtersets import OrganizationalModelFilterSet, NetBoxModelFilterSet