summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Holovaty <adrian@holovaty.com>2005-11-22 05:47:51 +0000
committerAdrian Holovaty <adrian@holovaty.com>2005-11-22 05:47:51 +0000
commit57981fb2fa525f66746fdb1ecfacf66e9b425375 (patch)
treeaa2a1820c2b4112be67bfbaa27dc050dba1c6785
parentbedf10a98dfe46dda39e8a20530f7476e7df90ff (diff)
Changed views.defaults page_not_found and server_error to pass in optional template_name override
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1350 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/views/defaults.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/django/views/defaults.py b/django/views/defaults.py
index 062f1a8cf5..95c18b4263 100644
--- a/django/views/defaults.py
+++ b/django/views/defaults.py
@@ -47,7 +47,7 @@ def shortcut(request, content_type_id, object_id):
return httpwrappers.HttpResponseRedirect(obj.get_absolute_url())
return httpwrappers.HttpResponseRedirect('http://%s%s' % (object_domain, obj.get_absolute_url()))
-def page_not_found(request):
+def page_not_found(request, template_name='404'):
"""
Default 404 handler, which looks for the requested URL in the redirects
table, redirects if found, and displays 404 page if not redirected.
@@ -55,15 +55,15 @@ def page_not_found(request):
Templates: `404`
Context: None
"""
- t = loader.get_template('404')
+ t = loader.get_template(template_name)
return httpwrappers.HttpResponseNotFound(t.render(Context()))
-def server_error(request):
+def server_error(request, template_name='500'):
"""
500 error handler.
Templates: `500`
Context: None
"""
- t = loader.get_template('500')
+ t = loader.get_template(template_name)
return httpwrappers.HttpResponseServerError(t.render(Context()))