Commit 181f2642 authored by Russell Keith-Magee's avatar Russell Keith-Magee
Browse files

[1.2.X] Fixed #14414 -- Improved contenttypes shortcut() view to check that... 

[1.2.X] Fixed #14414 -- Improved contenttypes shortcut() view to check that the ContentType has a model_class(). Thanks, subsume

Backport of r13994 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14385 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent c120794b

django/contrib/contenttypes/views.py

+2 −0
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ def shortcut(request, content_type_id, object_id): 
    # Look up the object, making sure it's got a get_absolute_url() function.

    try:

        content_type = ContentType.objects.get(pk=content_type_id)

        if not content_type.model_class():

            raise http.Http404("Content type %s object has no associated model" % content_type_id)

        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))