heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adding and making use of the new 404 error page :)

Browse Source
This commit is contained in:
Christopher Allan Webber 2011-08-20 15:55:08 -05:00
parent a7c641d11e
commit bae8f3d8c2
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mediagoblin/app.py
View File

@ -133,7 +133,7 @@ class MediaGoblinApp(object):
return request.get_response(redirect)(environ, start_response) return request.get_response(redirect)(environ, start_response)
# Okay, no matches. 404 time! # Okay, no matches. 404 time!
return exc.HTTPNotFound()(environ, start_response) return util.render_404(request)(environ, start_response)
controller = util.import_component(route_match['controller']) controller = util.import_component(route_match['controller'])
request.start_response = start_response request.start_response = start_response

14
mediagoblin/util.py
View File

@ -348,8 +348,10 @@ def get_locale_from_request(request):
accept_lang_matches = request.accept_language.best_matches() accept_lang_matches = request.accept_language.best_matches()
# Your routing can explicitly specify a target language # Your routing can explicitly specify a target language
if request.matchdict.has_key('locale'): matchdict = request.matchdict or {}
target_lang = request.matchdict['locale']
if matchdict.has_key('locale'):
target_lang = matchdict['locale']
elif request.session.has_key('target_lang'): elif request.session.has_key('target_lang'):
target_lang = request.session['target_lang'] target_lang = request.session['target_lang']
# Pull the first acceptable language # Pull the first acceptable language
@ -662,3 +664,11 @@ def gridify_cursor(this_cursor, num_cols=5):
the number of columns in the list the number of columns in the list
""" """
return gridify_list(list(this_cursor), num_cols) return gridify_list(list(this_cursor), num_cols)
def render_404(request):
"""
Render a 404.
"""
return render_to_response(
request, 'mediagoblin/404.html', {}, status=400)