Commit 780f239f authored by Malcolm Tredinnick's avatar Malcolm Tredinnick
Browse files

Fixed #8825 -- Fixed a small error model field setup (on the model class) from

r8855. Patch from Christofer Bernander. Test based on one from cgrady.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8908 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 43f901e5
Loading
Loading
Loading
Loading
+6 −6
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ class ModelBase(type):

            # All the fields of any type declared on this model
            new_fields = new_class._meta.local_fields + \
                         new_class._meta.many_to_many + \
                         new_class._meta.local_many_to_many + \
                         new_class._meta.virtual_fields
            field_names = set([f.name for f in new_fields])

+12 −1
Original line number Diff line number Diff line
@@ -71,6 +71,12 @@ class Article(models.Model):
class ArticleWithAuthor(Article):
    author = models.CharField(max_length=100)

class M2MBase(models.Model):
    articles = models.ManyToManyField(Article)

class M2MChild(M2MBase):
    name = models.CharField(max_length=50)

__test__ = {'API_TESTS':"""
# Regression for #7350, #7202
# Check that when you create a Parent object with a specific reference to an
@@ -231,4 +237,9 @@ Traceback (most recent call last):
    ...
DoesNotExist: ArticleWithAuthor matching query does not exist.

# Regression test for #8825: Make sure all inherited fields (esp. m2m fields, in
# this case) appear on the child class.
>>> M2MChild.objects.filter(articles__isnull=False)
[]

"""}