NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-16 04:02:52 -06:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Merge pull request #19310 from netbox-community/15971-preserve-null-filter

Browse Source 
Fixes #15971: Preserve 'none' selection in filter form fields
This commit is contained in:
bctiemann 2025-04-28 08:50:32 -04:00 committed by GitHub
commit bdef00f3b0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -133,6 +133,7 @@ class DynamicModelChoiceMixin:
def get_bound_field(self, form, field_name): def get_bound_field(self, form, field_name):
bound_field = BoundField(form, self, 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) # Set initial value based on prescribed child fields (if not already set)
if not self.initial and self.initial_params: if not self.initial and self.initial_params:
@ -163,8 +164,14 @@ class DynamicModelChoiceMixin:
else: else:
self.queryset = self.queryset.none() 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) # Set the data URL on the APISelect widget (if not already set)
widget = bound_field.field.widget
if not widget.attrs.get('data-url'): if not widget.attrs.get('data-url'):
viewname = get_viewname(self.queryset.model, action='list', rest_api=True) viewname = get_viewname(self.queryset.model, action='list', rest_api=True)
widget.attrs['data-url'] = reverse(viewname) widget.attrs['data-url'] = reverse(viewname)