summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorKapil Garg <kapilgarg1996@gmail.com>2017-03-22 04:59:14 +0530
committerTim Graham <timograham@gmail.com>2017-03-23 13:56:45 -0400
commita8c540accc7eb526e44ec2bc05881eb300f54530 (patch)
tree90b330205730cec1b5b78d3d69b2c61cd18f4807 /django
parent37b28c9d7aab12e52c7f93fe91a3d357e669139e (diff)
[1.11.x] Fixed #27969 -- Fixed models.Field.formfield() setting 'disabled' for fields with choices.
Backport of 7e09fa7f519daf2f9c26587c3da5dc044d84b032 from master
Diffstat (limited to 'django')
-rw-r--r--django/db/models/fields/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py
index 3aabb4497d..0af100efd9 100644
--- a/django/db/models/fields/__init__.py
+++ b/django/db/models/fields/__init__.py
@@ -879,7 +879,7 @@ class Field(RegisterLookupMixin):
for k in list(kwargs):
if k not in ('coerce', 'empty_value', 'choices', 'required',
'widget', 'label', 'initial', 'help_text',
- 'error_messages', 'show_hidden_initial'):
+ 'error_messages', 'show_hidden_initial', 'disabled'):
del kwargs[k]
defaults.update(kwargs)
if form_class is None: