NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-25 01:48:38 -06:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Fixes #9096: Remove duplicate filter tag when filtering by "none"

Browse Source
This commit is contained in:
jeremystretch 2022-04-11 08:51:11 -04:00
parent a9e05aec7c
commit 517d0158b6
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/release-notes/version-3.2.md
View File

@ -15,6 +15,7 @@
* [#9061](https://github.com/netbox-community/netbox/issues/9061) - Change inheritance order for DeviceComponentFilterSets * [#9061](https://github.com/netbox-community/netbox/issues/9061) - Change inheritance order for DeviceComponentFilterSets
* [#9065](https://github.com/netbox-community/netbox/issues/9065) - Min/max VID should not be required when filtering VLAN groups * [#9065](https://github.com/netbox-community/netbox/issues/9065) - Min/max VID should not be required when filtering VLAN groups
* [#9079](https://github.com/netbox-community/netbox/issues/9079) - Fail validation when an inventory item is assigned as its own parent * [#9079](https://github.com/netbox-community/netbox/issues/9079) - Fail validation when an inventory item is assigned as its own parent
* [#9096](https://github.com/netbox-community/netbox/issues/9096) - Remove duplicate filter tag when filtering by "none"
* [#9100](https://github.com/netbox-community/netbox/issues/9100) - Include position field in module type YAML export * [#9100](https://github.com/netbox-community/netbox/issues/9100) - Include position field in module type YAML export
--- ---

10
netbox/utilities/forms/utils.py
View File

@ -144,11 +144,11 @@ def get_selected_values(form, field_name):
label for value, label in choices if str(value) in filter_data or None in filter_data label for value, label in choices if str(value) in filter_data or None in filter_data
] ]
if hasattr(field, 'null_option'): # If the field has a `null_option` attribute set and it is selected,
# If the field has a `null_option` attribute set and it is selected, # add it to the field's grouped choices.
# add it to the field's grouped choices. if getattr(field, 'null_option') and None in filter_data:
if field.null_option is not None and None in filter_data: values.remove(None)
values.append(field.null_option) values.insert(0, field.null_option)
return values return values