NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-17 21:18:16 -06:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Remove obsolete fetch_trigger kwarg from dynamic model choice widgets

Browse Source
This commit is contained in:
Jeremy Stretch 2024-02-06 10:34:25 -05:00
parent 0a23318e8c
commit e0a71d2978
4 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
netbox/dcim/forms/filtersets.py
View File

@ -548,8 +548,7 @@ class ModuleTypeFilterForm(NetBoxModelFilterSetForm):
manufacturer_id = DynamicModelMultipleChoiceField( manufacturer_id = DynamicModelMultipleChoiceField(
queryset=Manufacturer.objects.all(), queryset=Manufacturer.objects.all(),
required=False, required=False,
label=_('Manufacturer'), label=_('Manufacturer')
fetch_trigger='open'
) )
part_number = forms.CharField( part_number = forms.CharField(
label=_('Part number'), label=_('Part number'),
@ -825,8 +824,7 @@ class VirtualDeviceContextFilterForm(
device = DynamicModelMultipleChoiceField( device = DynamicModelMultipleChoiceField(
queryset=Device.objects.all(), queryset=Device.objects.all(),
required=False, required=False,
label=_('Device'), label=_('Device')
fetch_trigger='open'
) )
status = forms.MultipleChoiceField( status = forms.MultipleChoiceField(
label=_('Status'), label=_('Status'),
@ -852,8 +850,7 @@ class ModuleFilterForm(LocalConfigContextFilterForm, TenancyFilterForm, NetBoxMo
manufacturer_id = DynamicModelMultipleChoiceField( manufacturer_id = DynamicModelMultipleChoiceField(
queryset=Manufacturer.objects.all(), queryset=Manufacturer.objects.all(),
required=False, required=False,
label=_('Manufacturer'), label=_('Manufacturer')
fetch_trigger='open'
) )
module_type_id = DynamicModelMultipleChoiceField( module_type_id = DynamicModelMultipleChoiceField(
queryset=ModuleType.objects.all(), queryset=ModuleType.objects.all(),
@ -861,8 +858,7 @@ class ModuleFilterForm(LocalConfigContextFilterForm, TenancyFilterForm, NetBoxMo
query_params={ query_params={
'manufacturer_id': '$manufacturer_id' 'manufacturer_id': '$manufacturer_id'
}, },
label=_('Type'), label=_('Type')
fetch_trigger='open'
) )
status = forms.MultipleChoiceField( status = forms.MultipleChoiceField(
label=_('Status'), label=_('Status'),
@ -1411,8 +1407,7 @@ class InventoryItemFilterForm(DeviceComponentFilterForm):
role_id = DynamicModelMultipleChoiceField( role_id = DynamicModelMultipleChoiceField(
queryset=InventoryItemRole.objects.all(), queryset=InventoryItemRole.objects.all(),
required=False, required=False,
label=_('Role'), label=_('Role')
fetch_trigger='open'
) )
manufacturer_id = DynamicModelMultipleChoiceField( manufacturer_id = DynamicModelMultipleChoiceField(
queryset=Manufacturer.objects.all(), queryset=Manufacturer.objects.all(),

3
netbox/extras/forms/filtersets.py
View File

@ -381,8 +381,7 @@ class ConfigContextFilterForm(SavedFiltersMixin, FilterForm):
cluster_type_id = DynamicModelMultipleChoiceField( cluster_type_id = DynamicModelMultipleChoiceField(
queryset=ClusterType.objects.all(), queryset=ClusterType.objects.all(),
required=False, required=False,
label=_('Cluster types'), label=_('Cluster types')
fetch_trigger='open'
) )
cluster_group_id = DynamicModelMultipleChoiceField( cluster_group_id = DynamicModelMultipleChoiceField(
queryset=ClusterGroup.objects.all(), queryset=ClusterGroup.objects.all(),

8
netbox/utilities/forms/fields/dynamic.py
View File

@ -64,8 +64,6 @@ class DynamicModelChoiceMixin:
null_option: The string used to represent a null selection (if any) null_option: The string used to represent a null selection (if any)
disabled_indicator: The name of the field which, if populated, will disable selection of the disabled_indicator: The name of the field which, if populated, will disable selection of the
choice (optional) choice (optional)
fetch_trigger: The event type which will cause the select element to
fetch data from the API. Must be 'load', 'open', or 'collapse'. (optional)
selector: Include an advanced object selection widget to assist the user in identifying the desired object selector: Include an advanced object selection widget to assist the user in identifying the desired object
""" """
filter = django_filters.ModelChoiceFilter filter = django_filters.ModelChoiceFilter
@ -79,7 +77,6 @@ class DynamicModelChoiceMixin:
initial_params=None, initial_params=None,
null_option=None, null_option=None,
disabled_indicator=None, disabled_indicator=None,
fetch_trigger=None,
empty_label=None, empty_label=None,
selector=False, selector=False,
**kwargs **kwargs
@ -89,7 +86,6 @@ class DynamicModelChoiceMixin:
self.initial_params = initial_params or {} self.initial_params = initial_params or {}
self.null_option = null_option self.null_option = null_option
self.disabled_indicator = disabled_indicator self.disabled_indicator = disabled_indicator
self.fetch_trigger = fetch_trigger
self.selector = selector self.selector = selector
self.empty_option = empty_label or "" self.empty_option = empty_label or ""
@ -109,10 +105,6 @@ class DynamicModelChoiceMixin:
if self.disabled_indicator is not None: if self.disabled_indicator is not None:
attrs['disabled-indicator'] = self.disabled_indicator attrs['disabled-indicator'] = self.disabled_indicator
# Set the fetch trigger, if any.
if self.fetch_trigger is not None:
attrs['data-fetch-trigger'] = self.fetch_trigger
# Attach any static query parameters # Attach any static query parameters
if (len(self.query_params) > 0): if (len(self.query_params) > 0):
widget.add_query_params(self.query_params) widget.add_query_params(self.query_params)

3
netbox/vpn/forms/model_forms.py
View File

@ -423,8 +423,7 @@ class L2VPNTerminationForm(NetBoxModelForm):
queryset=L2VPN.objects.all(), queryset=L2VPN.objects.all(),
required=True, required=True,
query_params={}, query_params={},
label=_('L2VPN'), label=_('L2VPN')
fetch_trigger='open'
) )
vlan = DynamicModelChoiceField( vlan = DynamicModelChoiceField(
queryset=VLAN.objects.all(), queryset=VLAN.objects.all(),