Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #8957 -- Fixed incorrect error message when Admin prepopulated_…

…fields refers to a field that does not exist. Thanks, charmless

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9002 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 32db67e6f9c739b265f2860ffda42092bfa6b594 1 parent 40cb11a
Adrian Holovaty adrianholovaty authored
Showing with 4 additions and 9 deletions.
  1. +4 −9 django/contrib/admin/validation.py
13 django/contrib/admin/validation.py
View
@@ -120,8 +120,7 @@ def validate(cls, model):
def validate_inline(cls):
# model is already verified to exist and be a Model
if cls.fk_name: # default value is None
- f = get_field(cls, cls.model, cls.model._meta,
- 'fk_name', cls.fk_name)
+ f = get_field(cls, cls.model, cls.model._meta, 'fk_name', cls.fk_name)
if not isinstance(f, models.ForeignKey):
raise ImproperlyConfigured("'%s.fk_name is not an instance of "
"models.ForeignKey." % cls.__name__)
@@ -229,19 +228,15 @@ def validate_base(cls, model):
% (cls.__name__, field))
check_isseq(cls, "prepopulated_fields['%s']" % field, val)
for idx, f in enumerate(val):
- get_field(cls, model,
- opts, "prepopulated_fields['%s'][%d]"
- % (f, idx), f)
+ get_field(cls, model, opts, "prepopulated_fields['%s'][%d]" % (field, idx), f)
def check_isseq(cls, label, obj):
if not isinstance(obj, (list, tuple)):
- raise ImproperlyConfigured("'%s.%s' must be a list or tuple."
- % (cls.__name__, label))
+ raise ImproperlyConfigured("'%s.%s' must be a list or tuple." % (cls.__name__, label))
def check_isdict(cls, label, obj):
if not isinstance(obj, dict):
- raise ImproperlyConfigured("'%s.%s' must be a dictionary."
- % (cls.__name__, label))
+ raise ImproperlyConfigured("'%s.%s' must be a dictionary." % (cls.__name__, label))
def get_field(cls, model, opts, label, field):
try:
Please sign in to comment.
Something went wrong with that request. Please try again.