Handle null_option in applied_filters template tag
#7206
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…n `applied_filters` template tag
jeremystretch
requested changes
Sep 8, 2021
netbox/utilities/forms/utils.py
Outdated
| if hasattr(field, 'choices'): | ||
| try: | ||
| choices = dict(unpack_grouped_choices(form.fields[field_name].choices)) | ||
| grouped_choices = [(k, v) for k, v in field.choices] |
Member
There was a problem hiding this comment.
This line can be omitted. We should call unpack_grouped_choices() first to flatten any grouped choices, then append the null choice as needed.
netbox/utilities/forms/utils.py
Outdated
| # 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)) |
Member
There was a problem hiding this comment.
Even though it's not actually referenced, we should probably set the value for the null choice to settings.FILTERS_NULL_CHOICE_VALUE just for clarity.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes: #7205
DynamicModelChoiceField.clean()toDynamicModelMultipleChoiceFieldfield so thatNoneis added to cleaned form datanull_optionforapplied_filterstemplate tag when selected. For example, if 'Global' is selected, the filter should show 'Global'. After my fix from 2a293d5 in APISelect,applied_filtersis now broken when a field with anull_optionis selected.