X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/73ef2b8442dc95f8b7279de812c30ac8626d5f39..dae8c833746bf716c05aaccba59a5fc049918163:/apps/wiki/helpers.py diff --git a/apps/wiki/helpers.py b/apps/wiki/helpers.py index dace3d00..877a9d0e 100644 --- a/apps/wiki/helpers.py +++ b/apps/wiki/helpers.py @@ -2,7 +2,7 @@ from datetime import datetime from functools import wraps from django import http -from django.utils import simplejson as json +import json from django.utils.functional import Promise @@ -22,11 +22,11 @@ class ExtendedEncoder(json.JSONEncoder): class JSONResponse(http.HttpResponse): def __init__(self, data={}, **kwargs): - # get rid of mimetype - kwargs.pop('mimetype', None) + # get rid of content_type + kwargs.pop('content_type', None) data = json.dumps(data, cls=ExtendedEncoder) - super(JSONResponse, self).__init__(data, mimetype="application/json", **kwargs) + super(JSONResponse, self).__init__(data, content_type="application/json", **kwargs) # return errors @@ -45,7 +45,7 @@ def ajax_login_required(view): @wraps(view) def authenticated_view(request, *args, **kwargs): if not request.user.is_authenticated(): - return http.HttpResponse("Login required.", status=401, mimetype="text/plain") + return http.HttpResponse("Login required.", status=401, content_type="text/plain") return view(request, *args, **kwargs) return authenticated_view @@ -55,7 +55,7 @@ def ajax_require_permission(permission): @wraps(view) def authorized_view(request, *args, **kwargs): if not request.user.has_perm(permission): - return http.HttpResponse("Access Forbidden.", status=403, mimetype="text/plain") + return http.HttpResponse("Access Forbidden.", status=403, content_type="text/plain") return view(request, *args, **kwargs) return authorized_view return decorator