Fix UnboundLocalError than could occur during ModelAdmin validation.

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

1 files changed, 16 insertions, 0 deletions

diff --git a/tests/regressiontests/admin_validation/tests.py b/tests/regressiontests/admin_validation/tests.py
index a80820cb67..2cf3c60062 100644
--- a/tests/regressiontests/admin_validation/tests.py
+++ b/tests/regressiontests/admin_validation/tests.py
@@ -256,3 +256,19 @@ class ValidationTestCase(TestCase):
             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)