fix #1475 - filter_overrides extra now applied when field has choices #1476
Conversation
This file contains 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
|
It would be great to get this merged and released @carltongibson so we can stop depending on my fork. |
|
@Spycho 👍 DF is on the list for a dust-off and release after Django 4.1a1, so I shall give it a look then. Thanks. |
We'll be dropping support for PY36, and Djangos<3.2 if you fancy making those adjustments? 🙂 |
|
Happy to, but wouldn't it be best to merge this in as is, as it works with all versions, and then refactor to use the new dictionary combining syntax after you've dropped 3.6 support? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Code change compatible with older python versions (
{**a, **b}rather thana | bused for combining dictionaries), as I spotted via running tox on your project it wants to run back to 3.6.Test added for this case, checked it fails without the change, passes with.
Closes #1475