Briq
/
django-polymorphic
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #200 - Exclude super-class from proxy model query sets 

These changes prevent the query sets on 'proxy' models from including
the items from the 'super-class'.
fix_request_path_info
Andrew Dodd 2016-05-04 15:52:44 +02:00
parent 75646f1f24
commit 120f124b91
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
polymorphic/managers.py
View File

@ -32,7 +32,10 @@ class PolymorphicManager(models.Manager):
super(PolymorphicManager, self).__init__(*args, **kwrags) super(PolymorphicManager, self).__init__(*args, **kwrags)
def get_queryset(self): def get_queryset(self):
return self.queryset_class(self.model, using=self._db) qs = self.queryset_class(self.model, using=self._db)
if self.model._meta.proxy:
qs = qs.instance_of(self.model)
return qs
# For Django 1.5 # For Django 1.5
if django.VERSION < (1, 7): if django.VERSION < (1, 7):

12
polymorphic/tests.py
View File

@ -1006,6 +1006,16 @@ class PolymorphicTests(TestCase):
self.assertIsInstance(items[0], ProxyChild) self.assertIsInstance(items[0], ProxyChild)
def test_queryset_on_proxy_model_does_not_return_superclasses(self):
ProxyBase.objects.create(some_data='Base1')
ProxyBase.objects.create(some_data='Base2')
ProxyChild.objects.create(some_data='Child1')
ProxyChild.objects.create(some_data='Child2')
ProxyChild.objects.create(some_data='Child3')
self.assertEquals(5, ProxyBase.objects.count())
self.assertEquals(3, ProxyChild.objects.count())
def test_proxy_get_real_instance_class(self): def test_proxy_get_real_instance_class(self):
""" """
The call to ``get_real_instance()`` also checks whether the returned model is of the correct type. The call to ``get_real_instance()`` also checks whether the returned model is of the correct type.
@ -1020,7 +1030,7 @@ class PolymorphicTests(TestCase):
self.assertEqual(pb.get_real_instance(), nonproxychild) self.assertEqual(pb.get_real_instance(), nonproxychild)
self.assertEqual(pb.name, name) self.assertEqual(pb.name, name)
pbm = ProxyChild.objects.get(id=1) pbm = NonProxyChild.objects.get(id=1)
self.assertEqual(pbm.get_real_instance_class(), NonProxyChild) self.assertEqual(pbm.get_real_instance_class(), NonProxyChild)
self.assertEqual(pbm.get_real_instance(), nonproxychild) self.assertEqual(pbm.get_real_instance(), nonproxychild)
self.assertEqual(pbm.name, name) self.assertEqual(pbm.name, name)