diff options
author | Pami Ketolainen <pami.ketolainen@jollamobile.com> | 2013-12-20 15:57:19 +0200 |
---|---|---|
committer | Pami Ketolainen <pami.ketolainen@jollamobile.com> | 2014-03-18 16:21:44 +0200 |
commit | e10e9002f637289315e85fb85a3f043f15fd5c59 (patch) | |
tree | 8a22fc620e50fddf51811a130eaab30347012847 | |
parent | 0821a96efea80729aaa871fe4e0d3710fbea0a95 (diff) | |
download | askbot-e10e9002f637289315e85fb85a3f043f15fd5c59.tar.gz askbot-e10e9002f637289315e85fb85a3f043f15fd5c59.tar.bz2 askbot-e10e9002f637289315e85fb85a3f043f15fd5c59.zip |
Fix 500 template processing error
-rw-r--r-- | askbot/setup_templates/urls.py | 3 | ||||
-rw-r--r-- | askbot/urls.py | 1 | ||||
-rw-r--r-- | askbot/views/error.py | 10 |
3 files changed, 12 insertions, 2 deletions
diff --git a/askbot/setup_templates/urls.py b/askbot/setup_templates/urls.py index 21338a0a..eb04e836 100644 --- a/askbot/setup_templates/urls.py +++ b/askbot/setup_templates/urls.py @@ -3,7 +3,6 @@ main url configuration file for the askbot site """ from django.conf import settings from django.conf.urls.defaults import handler404 -from django.conf.urls.defaults import handler500 from django.conf.urls.defaults import include from django.conf.urls.defaults import patterns from django.conf.urls.defaults import url @@ -40,3 +39,5 @@ if 'rosetta' in settings.INSTALLED_APPS: urlpatterns += patterns('', url(r'^rosetta/', include('rosetta.urls')), ) + +handler500 = 'askbot.views.error.internal_error' diff --git a/askbot/urls.py b/askbot/urls.py index 618562e7..e00a00e0 100644 --- a/askbot/urls.py +++ b/askbot/urls.py @@ -5,7 +5,6 @@ import os.path import django from django.conf import settings from django.conf.urls.defaults import url, patterns, include -from django.conf.urls.defaults import handler500, handler404 from django.contrib import admin from askbot import views from askbot.feed import RssLastestQuestionsFeed, RssIndividualQuestionFeed diff --git a/askbot/views/error.py b/askbot/views/error.py new file mode 100644 index 00000000..fab922ee --- /dev/null +++ b/askbot/views/error.py @@ -0,0 +1,10 @@ +from django.shortcuts import render + +def internal_error(request): + data = {} + try: + from askbot.conf import settings as askbot_settings + data['settings'] = askbot_settings + except Exception: + data['settings'] = {} + return render(request, '500.html', data) |