Ticket #16048: ticket16048-r16259.diff

tests/modeltests/generic_relations/tests.py

@@ -4 +4 @@
 from django.test import TestCase
 
 from models import (TaggedItem, ValuableTaggedItem, Comparison, Animal,
-    Vegetable, Mineral)
+    Vegetable, Mineral, Gecko)
 
 
 class GenericRelationsTests(TestCase):
@@ -223 +223 @@
         self.assertEqual(u''.join(form.as_p() for form in formset.forms), u"""<p><label for="id_x-0-tag">Tag:</label> <input id="id_x-0-tag" type="text" name="x-0-tag" maxlength="50" /></p>
 <p><label for="id_x-0-DELETE">Delete:</label> <input type="checkbox" name="x-0-DELETE" id="id_x-0-DELETE" /><input type="hidden" name="x-0-id" id="id_x-0-id" /></p>""")
 
+    def test_gfk_manager(self):
+        # GenericForeignKey should not use the default manager (which may filter objects) #16048
+        tailless = Gecko.objects.create(has_tail=False)
+        tag = TaggedItem.objects.create(content_object=tailless, tag="lizard")
+        self.assertEqual(tag.content_object, tailless)
 
 class CustomWidget(forms.CharField):
     pass

tests/modeltests/generic_relations/models.py

@@ -78 +78 @@
 
     def __unicode__(self):
         return self.name
+
+class GeckoManager(models.Manager):
+    def get_query_set(self):
+        return super(GeckoManager, self).get_query_set().filter(has_tail=True)
+
+class Gecko(models.Model):
+    has_tail = models.BooleanField()
+    objects = GeckoManager()

django/contrib/contenttypes/models.py

@@ -100 +100 @@
         method. The ObjectNotExist exception, if thrown, will not be caught,
         so code that calls this method should catch it.
         """
-        return self.model_class()._default_manager.using(self._state.db).get(**kwargs)
+        return self.model_class()._base_manager.using(self._state.db).get(**kwargs)
 
     def natural_key(self):
         return (self.app_label, self.model)