summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2016-01-28 13:49:51 -0500
committerTim Graham <timograham@gmail.com>2016-01-29 08:08:04 -0500
commit01db3249e5048093c85de33e5395ba737d330d0a (patch)
treee822ced2960ccadfc0e3d29882e6f56ae46b56de /django
parentefd855481581b5758d866a009bbd1074e74869b4 (diff)
[1.9.x] Fixed #26129 -- Made invalid forms display initial values of disabled fields.
Backport of 04564eb74d2d92eaf88b22ab8cec7ef45978111e from master
Diffstat (limited to 'django')
-rw-r--r--django/forms/fields.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/django/forms/fields.py b/django/forms/fields.py
index d2ae133486..e59cf81890 100644
--- a/django/forms/fields.py
+++ b/django/forms/fields.py
@@ -177,6 +177,8 @@ class Field(six.with_metaclass(RenameFieldMethods, object)):
For most fields, this will simply be data; FileFields need to handle it
a bit differently.
"""
+ if self.disabled:
+ return initial
return data
def widget_attrs(self, widget):