mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #31124 -- Fixed setting of get_FOO_display() when overriding inherited choices.

Browse Source 
Regression in 2d38eb0ab9
This commit is contained in:
Carlton Gibson
2020-01-07 11:52:09 +01:00
committed by Carlton Gibson
parent d202846ced
commit 29c126bb34
4 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
django/db/models/fields/__init__.py
View File

@@ -764,7 +764,11 @@ class Field(RegisterLookupMixin):
if not getattr(cls, self.attname, None):
setattr(cls, self.attname, self.descriptor_class(self))
if self.choices is not None:
if not hasattr(cls, 'get_%s_display' % self.name):
# Don't override a get_FOO_display() method defined explicitly on
# this class, but don't check methods derived from inheritance, to
# allow overriding inherited choices. For more complex inheritance
# structures users should override contribute_to_class().
if 'get_%s_display' % self.name not in cls.__dict__:
setattr(
cls,
'get_%s_display' % self.name,