Context Navigation

Ticket #15610: django_1.5.1_15610.patch

File django_1.5.1_15610.patch, 1.6 KB (added by 4glitch@…, 11 years ago)
This works for me on 1.5.1

diff --git a/django/contrib/contenttypes/generic.py b/django/contrib/contenttypes/generic.py
index 5690e6b..425c63a 100644

                class GenericForeignKey(object):
         # using this model
         ContentType = get_model("contenttypes", "contenttype")
         if obj:
             return ContentType.objects.db_manager(obj._state.db).get_for_model(obj)
+            return ContentType.objects.db_manager(ContentType.objects.db).get_for_model(obj)
         elif id:
             return ContentType.objects.db_manager(using).get_for_id(id)
         else:

diff --git a/django/contrib/contenttypes/models.py b/django/contrib/contenttypes/models.py
index b658655..92e8324 100644

-              a
 from django.db import models
+from django.db import router, DEFAULT_DB_ALIAS
 from django.utils.translation import ugettext_lazy as _
 from django.utils.encoding import smart_text, force_text
 from django.utils.encoding import python_2_unicode_compatible
-…
+               class ContentType(models.Model):
         method. The ObjectNotExist exception, if thrown, will not be caught,
         so code that calls this method should catch it.
         """
         return self.model_class()._base_manager.using(self._state.db).get(**kwargs)
+        return self.model_class()._base_manager.using(router.db_for_read(self.model_class()) or DEFAULT_DB_ALIAS).get(**kwargs)
     def get_all_objects_for_this_type(self, **kwargs):
         """