X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/00a90d6175599e055f5a84697c8388d81ac1b007..65750ae07c7891ea23adcddc3204d9a8c8fa0e9e:/apps/wiki/helpers.py?ds=inline diff --git a/apps/wiki/helpers.py b/apps/wiki/helpers.py index bc4b7602..b60265f5 100644 --- a/apps/wiki/helpers.py +++ b/apps/wiki/helpers.py @@ -1,8 +1,14 @@ -from django import http -from django.utils import simplejson as json -from django.utils.functional import Promise +# -*- 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.functional import Promise class ExtendedEncoder(json.JSONEncoder): @@ -22,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 @@ -44,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 @@ -54,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