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

Minor cleanup for get_selected_values()

Browse Source
This commit is contained in:
jeremystretch
2021-09-08 11:11:52 -04:00
parent a9c1c8968e
commit 45988b9818
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,7 @@
import re
from django import forms
from django.conf import settings
from django.forms.models import fields_for_model
from utilities.choices import unpack_grouped_choices
@ -124,17 +125,16 @@ def get_selected_values(form, field_name):
# Selection field
if hasattr(field, 'choices'):
try:
grouped_choices = [(k, v) for k, v in field.choices]
choices = unpack_grouped_choices(field.choices)
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:
grouped_choices.append((field.null_option, field.null_option))
choices.append((settings.FILTERS_NULL_CHOICE_VALUE, field.null_option))
choices = dict(unpack_grouped_choices(grouped_choices))
return [
label for value, label in choices.items() 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
]
except TypeError:
# Field uses dynamic choices. Show all that have been populated.