X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/4c48c47d0b84e516114c16ee191359166e93a51c..972798eca6a4dc8e9c7e5bc7cb86cf242a9f3d72:/apps/wiki/helpers.py?ds=sidebyside diff --git a/apps/wiki/helpers.py b/apps/wiki/helpers.py index dace3d00..b60265f5 100644 --- a/apps/wiki/helpers.py +++ b/apps/wiki/helpers.py @@ -1,8 +1,13 @@ +# -*- coding: utf-8 -*- +# +# This file is part of MIL/PEER, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. +# from datetime import datetime from functools import wraps +import json from django import http -from django.utils import simplejson as json from django.utils.functional import Promise @@ -23,10 +28,10 @@ class JSONResponse(http.HttpResponse): def __init__(self, data={}, **kwargs): # get rid of mimetype - kwargs.pop('mimetype', None) + 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 +50,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 +60,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