Ticket #1425: django_1425.diff

django/views/defaults.py

@@ -8 +8 @@
     "Redirect to an object's page based on a content-type ID and an object ID."
     # Look up the object, making sure it's got a get_absolute_url() function.
     try:
-        content_type = ContentType.objects.get_object(pk=content_type_id)
+        content_type = ContentType.objects.get(pk=content_type_id)
         obj = content_type.get_object_for_this_type(pk=object_id)
     except ObjectDoesNotExist:
         raise http.Http404, "Content type %s object %s doesn't exist" % (content_type_id, object_id)
@@ -27 +27 @@
     object_domain = None
 
     # Next, look for an many-to-many relationship to sites
-    if hasattr(obj, 'get_site_list'):
-        site_list = obj.get_site_list()
-        if site_list:
-            object_domain = site_list[0].domain
+    if hasattr(obj, 'sites'):
+        try:
+            object_domain = obj.sites.all()[0].domain
+        except Site.DoesNotExist:
+            pass
 
     # Next, look for a many-to-one relationship to sites
-    elif hasattr(obj, 'get_site'):
+    elif hasattr(obj, 'site'):
         try:
-            object_domain = obj.get_site().domain
+            object_domain = obj.site.domain
         except Site.DoesNotExist:
             pass