mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Merge branch 'develop' into feature

Browse Source
This commit is contained in:
jeremystretch
2022-04-15 12:09:28 -04:00
parent 03535ce50b 10c7fdb618
commit 4fac10ac4a
43 changed files with 429 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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
]
if hasattr(field, 'null_option'):
# If the field has a `null_option` attribute set and it is selected,
# add it to the field's grouped choices.
if field.null_option is not None and None in filter_data:
values.append(field.null_option)
# If the field has a `null_option` attribute set and it is selected,
# add it to the field's grouped choices.
if getattr(field, 'null_option', None) and None in filter_data:
values.remove(None)
values.insert(0, field.null_option)
return values