mirror of
https://github.com/netbox-community/netbox.git
synced 2025-07-13 16:47:34 -06:00
Merge pull request #19310 from netbox-community/15971-preserve-null-filter
Fixes #15971: Preserve 'none' selection in filter form fields
This commit is contained in:
commit
bdef00f3b0
@ -133,6 +133,7 @@ class DynamicModelChoiceMixin:
|
||||
|
||||
def get_bound_field(self, form, field_name):
|
||||
bound_field = BoundField(form, self, field_name)
|
||||
widget = bound_field.field.widget
|
||||
|
||||
# Set initial value based on prescribed child fields (if not already set)
|
||||
if not self.initial and self.initial_params:
|
||||
@ -163,8 +164,14 @@ class DynamicModelChoiceMixin:
|
||||
else:
|
||||
self.queryset = self.queryset.none()
|
||||
|
||||
# Normalize the widget choices to a list to accommodate the "null" option, if set
|
||||
if self.null_option:
|
||||
widget.choices = [
|
||||
(settings.FILTERS_NULL_CHOICE_VALUE, self.null_option),
|
||||
*[c for c in widget.choices]
|
||||
]
|
||||
|
||||
# Set the data URL on the APISelect widget (if not already set)
|
||||
widget = bound_field.field.widget
|
||||
if not widget.attrs.get('data-url'):
|
||||
viewname = get_viewname(self.queryset.model, action='list', rest_api=True)
|
||||
widget.attrs['data-url'] = reverse(viewname)
|
||||
|
Loading…
Reference in New Issue
Block a user