diff --git a/netbox/dcim/forms/filtersets.py b/netbox/dcim/forms/filtersets.py index 81ca2a4cf..89793528d 100644 --- a/netbox/dcim/forms/filtersets.py +++ b/netbox/dcim/forms/filtersets.py @@ -548,8 +548,7 @@ class ModuleTypeFilterForm(NetBoxModelFilterSetForm): manufacturer_id = DynamicModelMultipleChoiceField( queryset=Manufacturer.objects.all(), required=False, - label=_('Manufacturer'), - fetch_trigger='open' + label=_('Manufacturer') ) part_number = forms.CharField( label=_('Part number'), @@ -825,8 +824,7 @@ class VirtualDeviceContextFilterForm( device = DynamicModelMultipleChoiceField( queryset=Device.objects.all(), required=False, - label=_('Device'), - fetch_trigger='open' + label=_('Device') ) status = forms.MultipleChoiceField( label=_('Status'), @@ -852,8 +850,7 @@ class ModuleFilterForm(LocalConfigContextFilterForm, TenancyFilterForm, NetBoxMo manufacturer_id = DynamicModelMultipleChoiceField( queryset=Manufacturer.objects.all(), required=False, - label=_('Manufacturer'), - fetch_trigger='open' + label=_('Manufacturer') ) module_type_id = DynamicModelMultipleChoiceField( queryset=ModuleType.objects.all(), @@ -861,8 +858,7 @@ class ModuleFilterForm(LocalConfigContextFilterForm, TenancyFilterForm, NetBoxMo query_params={ 'manufacturer_id': '$manufacturer_id' }, - label=_('Type'), - fetch_trigger='open' + label=_('Type') ) status = forms.MultipleChoiceField( label=_('Status'), @@ -1411,8 +1407,7 @@ class InventoryItemFilterForm(DeviceComponentFilterForm): role_id = DynamicModelMultipleChoiceField( queryset=InventoryItemRole.objects.all(), required=False, - label=_('Role'), - fetch_trigger='open' + label=_('Role') ) manufacturer_id = DynamicModelMultipleChoiceField( queryset=Manufacturer.objects.all(), diff --git a/netbox/extras/forms/filtersets.py b/netbox/extras/forms/filtersets.py index 408517c45..3a6421901 100644 --- a/netbox/extras/forms/filtersets.py +++ b/netbox/extras/forms/filtersets.py @@ -381,8 +381,7 @@ class ConfigContextFilterForm(SavedFiltersMixin, FilterForm): cluster_type_id = DynamicModelMultipleChoiceField( queryset=ClusterType.objects.all(), required=False, - label=_('Cluster types'), - fetch_trigger='open' + label=_('Cluster types') ) cluster_group_id = DynamicModelMultipleChoiceField( queryset=ClusterGroup.objects.all(), diff --git a/netbox/utilities/forms/fields/dynamic.py b/netbox/utilities/forms/fields/dynamic.py index 797ee865c..4283fbd05 100644 --- a/netbox/utilities/forms/fields/dynamic.py +++ b/netbox/utilities/forms/fields/dynamic.py @@ -64,8 +64,6 @@ class DynamicModelChoiceMixin: 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 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 """ filter = django_filters.ModelChoiceFilter @@ -79,7 +77,6 @@ class DynamicModelChoiceMixin: initial_params=None, null_option=None, disabled_indicator=None, - fetch_trigger=None, empty_label=None, selector=False, **kwargs @@ -89,7 +86,6 @@ class DynamicModelChoiceMixin: self.initial_params = initial_params or {} self.null_option = null_option self.disabled_indicator = disabled_indicator - self.fetch_trigger = fetch_trigger self.selector = selector self.empty_option = empty_label or "" @@ -109,10 +105,6 @@ class DynamicModelChoiceMixin: if self.disabled_indicator is not None: 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 if (len(self.query_params) > 0): widget.add_query_params(self.query_params) diff --git a/netbox/vpn/forms/model_forms.py b/netbox/vpn/forms/model_forms.py index f936de88c..9e5e17a09 100644 --- a/netbox/vpn/forms/model_forms.py +++ b/netbox/vpn/forms/model_forms.py @@ -423,8 +423,7 @@ class L2VPNTerminationForm(NetBoxModelForm): queryset=L2VPN.objects.all(), required=True, query_params={}, - label=_('L2VPN'), - fetch_trigger='open' + label=_('L2VPN') ) vlan = DynamicModelChoiceField( queryset=VLAN.objects.all(),