diff options
| author | Russell Keith-Magee <russell@keith-magee.com> | 2010-10-28 12:16:21 +0000 |
|---|---|---|
| committer | Russell Keith-Magee <russell@keith-magee.com> | 2010-10-28 12:16:21 +0000 |
| commit | 181f26428abf3679e2b747fd49b88b0f104918f2 (patch) | |
| tree | 0717ce38b0c13680d1449fc0574262b2662f6065 | |
| parent | c120794b9d1efa20732ec3bf389e7487a7408e8b (diff) | |
[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
| -rw-r--r-- | django/contrib/contenttypes/views.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/django/contrib/contenttypes/views.py b/django/contrib/contenttypes/views.py index ba82564974..ac0feffe7a 100644 --- a/django/contrib/contenttypes/views.py +++ b/django/contrib/contenttypes/views.py @@ -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)) |