|
@@ -7,10 +7,7 @@ from misago.admin.views.errorpages import admin_error_page, admin_csrf_failure
|
|
|
|
|
|
|
|
|
|
def _ajax_error(code=406, message=None):
|
|
def _ajax_error(code=406, message=None):
|
|
- response_dict = {'is_error': True}
|
|
|
|
- if message:
|
|
|
|
- response_dict['message'] = unicode(message)
|
|
|
|
- return JsonResponse(response_dict, status=code)
|
|
|
|
|
|
+ return JsonResponse({'detail': message}, status=code)
|
|
|
|
|
|
|
|
|
|
@admin_error_page
|
|
@admin_error_page
|
|
@@ -24,14 +21,14 @@ def _error_page(request, code, message=None):
|
|
|
|
|
|
def permission_denied(request, message=None):
|
|
def permission_denied(request, message=None):
|
|
if request.is_ajax():
|
|
if request.is_ajax():
|
|
- return _ajax_error(403, message)
|
|
|
|
|
|
+ return _ajax_error(403, message or _("Permission denied."))
|
|
else:
|
|
else:
|
|
return _error_page(request, 403, message)
|
|
return _error_page(request, 403, message)
|
|
|
|
|
|
|
|
|
|
def page_not_found(request):
|
|
def page_not_found(request):
|
|
if request.is_ajax():
|
|
if request.is_ajax():
|
|
- return _ajax_error(404, _("Invalid API link."))
|
|
|
|
|
|
+ return _ajax_error(404, "Not found.")
|
|
else:
|
|
else:
|
|
return _error_page(request, 404)
|
|
return _error_page(request, 404)
|
|
|
|
|
|
@@ -39,6 +36,8 @@ def page_not_found(request):
|
|
@admin_csrf_failure
|
|
@admin_csrf_failure
|
|
def csrf_failure(request, reason=""):
|
|
def csrf_failure(request, reason=""):
|
|
if request.is_ajax():
|
|
if request.is_ajax():
|
|
|
|
+ print 'C> %s' % request.META.get("CSRF_COOKIE")
|
|
|
|
+ print 'E> %s' % request.META.get('HTTP_X_CSRFTOKEN', '')
|
|
return _ajax_error(403, _("Request authentication is invalid."))
|
|
return _ajax_error(403, _("Request authentication is invalid."))
|
|
else:
|
|
else:
|
|
response = render(request, 'misago/errorpages/csrf_failure.html')
|
|
response = render(request, 'misago/errorpages/csrf_failure.html')
|