Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fix UnboundLocalError than could occur during ModelAdmin validation.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16262 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 909e002808135ee943643e6b1866e9aa5cb0b42d 1 parent d95355b
@kmtracey kmtracey authored
View
6 django/contrib/admin/validation.py
@@ -247,9 +247,9 @@ def validate_fields_spec(cls, model, opts, flds, label):
try:
f = opts.get_field(field)
except models.FieldDoesNotExist:
- # If we can't find a field on the model that matches,
- # it could be an extra field on the form.
- pass
+ # If we can't find a field on the model that matches, it could be an
+ # extra field on the form; nothing to check so move on to the next field.
+ continue
if isinstance(f, models.ManyToManyField) and not f.rel.through._meta.auto_created:
raise ImproperlyConfigured("'%s.%s' "
"can't include the ManyToManyField field '%s' because "
View
16 tests/regressiontests/admin_validation/tests.py
@@ -256,3 +256,19 @@ class FieldsOnFormOnlyAdmin(admin.ModelAdmin):
fields = ['title', 'extra_data']
validate(FieldsOnFormOnlyAdmin, Song)
+
+ def test_non_model_first_field(self):
+ """
+ Regression for ensuring ModelAdmin.field can handle first elem being a
+ non-model field (test fix for UnboundLocalError introduced with r16225).
+ """
+ class SongForm(forms.ModelForm):
+ extra_data = forms.CharField()
+ class Meta:
+ model = Song
+
+ class FieldsOnFormOnlyAdmin(admin.ModelAdmin):
+ form = SongForm
+ fields = ['extra_data', 'title']
+
+ validate(FieldsOnFormOnlyAdmin, Song)
Please sign in to comment.
Something went wrong with that request. Please try again.