Fixed #18083 -- Fixed cascade deletion with proxy model of concrete subclass. Thanks Simon Charette for report and patch.

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

1 files changed, 4 insertions, 3 deletions

diff --git a/django/db/models/deletion.py b/django/db/models/deletion.py
index 730847ef21..d8bb8f2e66 100644
--- a/django/db/models/deletion.py
+++ b/django/db/models/deletion.py
@@ -154,9 +154,10 @@ class Collector(object):
 
         model = new_objs[0].__class__
 
-        # Recursively collect parent models, but not their related objects.
-        # These will be found by meta.get_all_related_objects()
-        for parent_model, ptr in model._meta.parents.iteritems():
+        # Recursively collect concrete model's parent models, but not their
+        # related objects. These will be found by meta.get_all_related_objects()
+        concrete_model = model._meta.concrete_model
+        for ptr in concrete_model._meta.parents.itervalues():
             if ptr:
                 parent_objs = [getattr(obj, ptr.name) for obj in new_objs]
                 self.collect(parent_objs, source=model,