Ticket #8997: get_absolute_url_patch.diff

django/contrib/contenttypes/views.py

@@ -13 +13 @@
         obj = content_type.get_object_for_this_type(pk=object_id)
     except (ObjectDoesNotExist, ValueError):
         raise http.Http404("Content type %s object %s doesn't exist" % (content_type_id, object_id))
-    try:
-        absurl = obj.get_absolute_url()
-    except AttributeError:
+    if not hasattr(obj, 'get_absolute_url'):
         raise http.Http404("%s objects don't have get_absolute_url() methods" % content_type.name)
+    absurl = obj.get_absolute_url()
 
     # Try to figure out the object's domain, so we can do a cross-site redirect
     # if necessary.

tests/regressiontests/contenttypes_regress/tests.py

@@ +1 @@
+from django import db
+from django.conf import settings
+from django.contrib.contenttypes.models import ContentType
+from django.contrib.contenttypes.views import shortcut
+from django.http import HttpRequest
+from django.test import TestCase
+
+
+class ContentTypesRegression(TestCase):
+
+    def setUp(self):
+        self.old_DEBUG = settings.DEBUG
+        settings.DEBUG = True
+        ContentType.objects.clear_cache()
+        db.reset_queries()
+
+    def tearDown(self):
+        settings.DEBUG = self.old_DEBUG
+
+    def test_shortcut_attribute_error(self):
+        """
+        Check that the shortcut view (used for the admin "view on site"
+        functionality) does not catch an AttributeError raised by the model's
+        get_absolute_url method
+        """
+        
+        request = HttpRequest()
+        request.META = {
+            "SERVER_NAME": "Example.com",
+            "SERVER_PORT": "80",
+        }
+        from django.contrib.auth.models import Group
+        Group.get_absolute_url = lambda x: x.invalid_field
+        user_ct = ContentType.objects.get_for_model(Group)
+        obj = Group.objects.create(name="staff")
+        with self.assertRaises(AttributeError):
+            shortcut(request, user_ct.id, obj.id)

tests/regressiontests/contenttypes_regress/models.py

@@ +1 @@
+# models.py file for tests to run.