Ticket #10405: 10405.2.patch

django/core/exceptions.py

@@ -3 +3 @@
 """
 
 class DjangoRuntimeWarning(RuntimeWarning):
-   pass
+    pass
 
 class ObjectDoesNotExist(Exception):
     "The requested object does not exist"

django/db/models/fields/related.py

@@ -907 +907 @@
 
     def formfield(self, **kwargs):
         db = kwargs.pop('using', None)
+        if isinstance(self.rel.to, basestring):
+            raise ValueError("Cannot create form field for %r yet, because "
+                 "its related model %r has not been loaded yet" % (self.name, self.rel.to))
         defaults = {
             'form_class': forms.ModelChoiceField,
             'queryset': self.rel.to._default_manager.using(db).complex_filter(self.rel.limit_choices_to),

tests/regressiontests/forms/tests/models.py

@@ -1 +1 @@
 # -*- coding: utf-8 -*-
 import datetime
 from django.core.files.uploadedfile import SimpleUploadedFile
+from django.db import models
+from django.forms.models import ModelForm, ModelFormMetaclass
 from django.forms import Form, ModelForm, FileField, ModelChoiceField
 from django.test import TestCase
 from regressiontests.forms.models import ChoiceModel, ChoiceOptionModel, ChoiceFieldModel, FileModel, Group, BoundaryModel, Defaults
 
-
 class ChoiceFieldForm(ModelForm):
     class Meta:
         model = ChoiceFieldModel
@@ -159 +160 @@
         self.assertEqual(obj.name, u'class default value')
         self.assertEqual(obj.value, 99)
         self.assertEqual(obj.def_date, datetime.date(1999, 3, 2))
+
+class RelatedModelFormTests(TestCase):
+    def test_invalid_loading_order(self):
+        """
+        Test for issue 10405
+        """
+        class A(models.Model):
+            ref = models.ForeignKey("B")
+            
+        class Meta:
+            model=A
+        
+        self.assertRaises(ValueError, ModelFormMetaclass, 'Form', (ModelForm,), {'Meta': Meta})
+        
+        class B(models.Model):
+            pass
+        
+    def test_valid_loading_order(self):
+        """
+        Test for issue 10405
+        """
+        class A(models.Model):
+            ref = models.ForeignKey("B")
+        
+        class B(models.Model):
+            pass
+            
+        class Meta:
+            model=A
+        
+        self.assertTrue(issubclass(ModelFormMetaclass('Form', (ModelForm,), {'Meta': Meta}), ModelForm))