NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-30 04:16:24 -06:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

10711 review changes

Browse Source
This commit is contained in:
Arthur Hanson 2024-11-05 07:59:17 -08:00
parent 610eb1b32e
commit 3f1b2e0acf
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
netbox/dcim/forms/mixins.py
View File

@ -96,6 +96,7 @@ class ScopedBulkEditForm(forms.Form):
except ObjectDoesNotExist: except ObjectDoesNotExist:
pass pass
class ScopedImportForm(forms.Form): class ScopedImportForm(forms.Form):
scope_type = CSVContentTypeField( scope_type = CSVContentTypeField(
queryset=ContentType.objects.filter(model__in=LOCATION_SCOPE_TYPES), queryset=ContentType.objects.filter(model__in=LOCATION_SCOPE_TYPES),

12
netbox/wireless/api/serializers_/wirelesslans.py
View File

@ -1,8 +1,10 @@
from rest_framework import serializers from rest_framework import serializers
from dcim.constants import LOCATION_SCOPE_TYPES
from django.contrib.contenttypes.models import ContentType
from drf_spectacular.utils import extend_schema_field from drf_spectacular.utils import extend_schema_field
from ipam.api.serializers_.vlans import VLANSerializer from ipam.api.serializers_.vlans import VLANSerializer
from netbox.api.fields import ChoiceField from netbox.api.fields import ChoiceField, ContentTypeField
from netbox.api.serializers import NestedGroupModelSerializer, NetBoxModelSerializer from netbox.api.serializers import NestedGroupModelSerializer, NetBoxModelSerializer
from tenancy.api.serializers_.tenants import TenantSerializer from tenancy.api.serializers_.tenants import TenantSerializer
from utilities.api import get_serializer_for_model from utilities.api import get_serializer_for_model
@ -36,6 +38,14 @@ class WirelessLANSerializer(NetBoxModelSerializer):
tenant = TenantSerializer(nested=True, required=False, allow_null=True) tenant = TenantSerializer(nested=True, required=False, allow_null=True)
auth_type = ChoiceField(choices=WirelessAuthTypeChoices, required=False, allow_blank=True) auth_type = ChoiceField(choices=WirelessAuthTypeChoices, required=False, allow_blank=True)
auth_cipher = ChoiceField(choices=WirelessAuthCipherChoices, required=False, allow_blank=True) auth_cipher = ChoiceField(choices=WirelessAuthCipherChoices, required=False, allow_blank=True)
scope_type = ContentTypeField(
queryset=ContentType.objects.filter(
model__in=LOCATION_SCOPE_TYPES
),
allow_null=True,
required=False,
default=None
)
scope_id = serializers.IntegerField(allow_null=True, required=False, default=None) scope_id = serializers.IntegerField(allow_null=True, required=False, default=None)
scope = serializers.SerializerMethodField(read_only=True) scope = serializers.SerializerMethodField(read_only=True)

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

@ -80,7 +80,7 @@ class WirelessLANImportForm(ScopedImportForm, NetBoxModelImportForm):
'description', 'comments', 'tags', 'description', 'comments', 'tags',
) )
labels = { labels = {
'scope_id': 'Scope ID', 'scope_id': _('Scope ID'),
} }

1
netbox/wireless/forms/model_forms.py
View File

@ -71,7 +71,6 @@ class WirelessLANForm(ScopedForm, TenancyForm, NetBoxModelForm):
} }
class WirelessLinkForm(TenancyForm, NetBoxModelForm): class WirelessLinkForm(TenancyForm, NetBoxModelForm):
site_a = DynamicModelChoiceField( site_a = DynamicModelChoiceField(
queryset=Site.objects.all(), queryset=Site.objects.all(),