Fixed #24908 -- Duplicate readonly field rendering. #4824
Closed
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
ModelAdmin added readonly_fields to exclude, but would not un-declare them if they were overridden.
| @@ -613,8 +614,14 @@ def get_form(self, request, obj=None, **kwargs): | |||
| # if exclude is an empty list we pass None to be consistent with the | |||
| # default on modelform_factory | |||
| exclude = exclude or None | |||
|
|
|||
| # Cancel out overridden form fields which are in readonly_fields. | |||
| new_attrs = OrderedDict([(f, None) for f in readonly_fields | |||
There was a problem hiding this comment.
I don't think keeping the attributes as None on the modelform is the right approach. I think they shouldn't be there at all.
Furthermore, we use hanging indents or keep everything in one line if it doesn't exceed 119 characters (I don't think you need the explicit list in there, a generator should work:
new_attrs = OrderedDict(
(f, None) for f in readonly_fields
if f in self.form.declared_fields
)There was a problem hiding this comment.
|
As an aside: please do not add @ mentions in the commit messages. People get notified on every push (I think) of that commit to GitHub ;) |
|
merged in fedef7b, thanks! |
|
I thought you'd want me to rebase first anyway, my bad. |
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.
ModelAdmin added readonly_fields to exclude, but would not un-declare
them if they were overridden, causing the readonly field to be rendered
twice.
https://code.djangoproject.com/ticket/24908