Fixed #12481: Updated admin validation code to not reject non-editable fields in readonly_fields, since these are handled fine by the display code itself. Thanks lashni and Alex.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12730 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 6 insertions, 0 deletions

diff --git a/django/contrib/admin/validation.py b/django/contrib/admin/validation.py
index 94d4bbd9ce..f743f2c6c7 100644
--- a/django/contrib/admin/validation.py
+++ b/django/contrib/admin/validation.py
@@ -245,6 +245,12 @@ def validate_base(cls, model):
                 if type(fields) != tuple:
                     fields = (fields,)
                 for field in fields:
+                    if field in cls.readonly_fields:
+                        # Stuff can be put in fields that isn't actually a
+                        # model field if it's in readonly_fields,
+                        # readonly_fields will handle the validation of such
+                        # things.
+                        continue
                     check_formfield(cls, model, opts, "fieldsets[%d][1]['fields']" % idx, field)
                     try:
                         f = opts.get_field(field)