Closes #11765: Remove StaticSelect & StaticSelectMultiple (#11767)

* Remove StaticSelect, StaticSelectMultiple form widgets

* Tag custom ChoiceField, MultipleChoiceField classes for removal in v3.6
This commit is contained in:
Jeremy Stretch
2023-02-16 10:25:51 -05:00
committed by jeremystretch
parent c73829fe92
commit b9bd96f0c7
30 changed files with 221 additions and 485 deletions
+2 -5
View File
@@ -4,9 +4,7 @@ from django.utils.translation import gettext as _
from core.choices import DataSourceTypeChoices
from core.models import *
from netbox.forms import NetBoxModelBulkEditForm
from utilities.forms import (
add_blank_choice, BulkEditNullBooleanSelect, CommentField, StaticSelect,
)
from utilities.forms import add_blank_choice, BulkEditNullBooleanSelect, CommentField
__all__ = (
'DataSourceBulkEditForm',
@@ -17,8 +15,7 @@ class DataSourceBulkEditForm(NetBoxModelBulkEditForm):
type = forms.ChoiceField(
choices=add_blank_choice(DataSourceTypeChoices),
required=False,
initial='',
widget=StaticSelect()
initial=''
)
enabled = forms.NullBooleanField(
required=False,
+4 -6
View File
@@ -4,9 +4,7 @@ from django.utils.translation import gettext as _
from core.choices import *
from core.models import *
from netbox.forms import NetBoxModelFilterSetForm
from utilities.forms import (
BOOLEAN_WITH_BLANK_CHOICES, DynamicModelMultipleChoiceField, MultipleChoiceField, StaticSelect,
)
from utilities.forms import BOOLEAN_WITH_BLANK_CHOICES, DynamicModelMultipleChoiceField
__all__ = (
'DataFileFilterForm',
@@ -20,17 +18,17 @@ class DataSourceFilterForm(NetBoxModelFilterSetForm):
(None, ('q', 'filter_id')),
('Data Source', ('type', 'status')),
)
type = MultipleChoiceField(
type = forms.MultipleChoiceField(
choices=DataSourceTypeChoices,
required=False
)
status = MultipleChoiceField(
status = forms.MultipleChoiceField(
choices=DataSourceStatusChoices,
required=False
)
enabled = forms.NullBooleanField(
required=False,
widget=StaticSelect(
widget=forms.Select(
choices=BOOLEAN_WITH_BLANK_CHOICES
)
)
+2 -2
View File
@@ -3,7 +3,7 @@ import copy
from django import forms
from core.models import *
from netbox.forms import NetBoxModelForm, StaticSelect
from netbox.forms import NetBoxModelForm
from netbox.registry import registry
from utilities.forms import CommentField
@@ -21,7 +21,7 @@ class DataSourceForm(NetBoxModelForm):
'name', 'type', 'source_url', 'enabled', 'description', 'comments', 'ignore_rules', 'tags',
]
widgets = {
'type': StaticSelect(
'type': forms.Select(
attrs={
'hx-get': '.',
'hx-include': '#form_fields input',