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

Remove choices from rf_channel_width

This commit is contained in:
jeremystretch
2021-10-15 10:06:49 -04:00
parent 01d3c062f2
commit b7317bfe29
7 changed files with 5 additions and 27 deletions

View File

@@ -637,7 +637,6 @@ class InterfaceSerializer(PrimaryModelSerializer, LinkTerminationSerializer, Con
mode = ChoiceField(choices=InterfaceModeChoices, allow_blank=True, required=False)
rf_role = ChoiceField(choices=WirelessRoleChoices, required=False, allow_null=True)
rf_channel = ChoiceField(choices=WirelessChannelChoices, required=False)
rf_channel_width = ChoiceField(choices=WirelessChannelWidthChoices, required=False, allow_null=True)
untagged_vlan = NestedVLANSerializer(required=False, allow_null=True)
tagged_vlans = SerializedPKRelatedField(
queryset=VLAN.objects.all(),

View File

@@ -1014,11 +1014,9 @@ class InterfaceFilterForm(DeviceComponentFilterForm):
widget=StaticSelectMultiple(),
label='Wireless channel'
)
rf_channel_width = forms.MultipleChoiceField(
choices=WirelessChannelWidthChoices,
rf_channel_width = forms.IntegerField(
required=False,
widget=StaticSelectMultiple(),
label='Channel width'
label='Channel width (kHz)'
)
tag = TagFilterField(model)

View File

@@ -1117,7 +1117,6 @@ class InterfaceForm(BootstrapMixin, InterfaceCommonForm, CustomFieldModelForm):
'mode': StaticSelect(),
'rf_role': StaticSelect(),
'rf_channel': StaticSelect(),
'rf_channel_width': StaticSelect(),
}
labels = {
'mode': '802.1Q Mode',

View File

@@ -480,10 +480,8 @@ class InterfaceCreateForm(ComponentCreateForm, InterfaceCommonForm):
widget=StaticSelect(),
label='Wireless channel'
)
rf_channel_width = forms.ChoiceField(
choices=add_blank_choice(WirelessChannelWidthChoices),
rf_channel_width = forms.IntegerField(
required=False,
widget=StaticSelect(),
label='Channel width'
)
untagged_vlan = DynamicModelChoiceField(

View File

@@ -538,10 +538,9 @@ class Interface(ComponentModel, BaseInterface, LinkTermination, PathEndpoint):
verbose_name='Wireless channel'
)
rf_channel_width = models.PositiveSmallIntegerField(
choices=WirelessChannelWidthChoices,
blank=True,
null=True,
verbose_name='Channel width'
verbose_name='Channel width (kHz)'
)
wireless_link = models.ForeignKey(
to='wireless.WirelessLink',