Context Navigation

Ticket #10953: proxy-proxy.diff

File proxy-proxy.diff, 1.8 KB (added by Alex Gaynor, 16 years ago)

diff --git a/django/db/models/base.py b/django/db/models/base.py
index 05cd0d9..3a3fbf1 100644

                class ModelBase(type):
                     new_class._meta.local_many_to_many):
                 raise FieldError("Proxy model '%s' contains model fields."
                         % name)
+            while base._meta.proxy:
+                base = base._meta.proxy_for_model
             new_class._meta.setup_proxy(base)
         # Do the appropriate setup for any model parents.
-…
+               class ModelBase(type):
                 if isinstance(f, OneToOneField)])
         for base in parents:
+            original_base = base
             if not hasattr(base, '_meta'):
                 # Things without _meta aren't functional models, so they're
                 # uninteresting parents.
-…
+               class ModelBase(type):
             # Proxy models inherit the non-abstract managers from their base,
             # unless they have redefined any of them.
             if is_proxy:
                 new_class.copy_managers(base._meta.concrete_managers)
+                new_class.copy_managers(original_base._meta.concrete_managers)
             # Inherit virtual fields (like GenericForeignKey) from the parent
             # class

diff --git a/tests/modeltests/proxy_models/models.py b/tests/modeltests/proxy_models/models.py
index ab38112..1c380e8 100644

                FieldError: Proxy model 'NoNewFields' contains model fields.
 >>> ctype = ContentType.objects.get_for_model
 >>> ctype(Person) is ctype(OtherPerson)
 True
-"""}
+>>> MyPersonProxy.objects.all()
+[<MyPersonProxy: barney>, <MyPersonProxy: fred>]
+"""}