X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/4983ea69a6e6c266b0466a851fb4a1ddd27767b4..8a3885e1467e4c441721eaae608755a9fd10b33f:/src/wolnelektury/utils.py diff --git a/src/wolnelektury/utils.py b/src/wolnelektury/utils.py index dfa8522f8..245c076b1 100644 --- a/src/wolnelektury/utils.py +++ b/src/wolnelektury/utils.py @@ -4,9 +4,7 @@ import codecs import csv from functools import wraps -from inspect import getargspec from io import BytesIO -import json import os import re @@ -14,7 +12,6 @@ from django.conf import settings from django.contrib import admin from django.core.cache import cache from django.core.mail import send_mail -from django.http import HttpResponse from django.template.loader import render_to_string from django.utils.translation import get_language from django.conf import settings @@ -30,81 +27,6 @@ def makedirs(path): os.makedirs(path) -def stringify_keys(dictionary): - return dict((keyword.encode('ascii'), value) - for keyword, value in dictionary.items()) - - -def json_encode(obj, sort_keys=True, ensure_ascii=False): - return json.dumps(obj, sort_keys=sort_keys, ensure_ascii=ensure_ascii) - - -def json_decode(obj): - return json.loads(obj) - - -def json_decode_fallback(value): - try: - return json_decode(value) - except ValueError: - return value - - -class AjaxError(Exception): - pass - - -def ajax(login_required=False, method=None, template=None, permission_required=None): - def decorator(fun): - @wraps(fun) - def ajax_view(request): - kwargs = {} - request_params = None - if method == 'post': - request_params = request.POST - elif method == 'get': - request_params = request.GET - fun_params, xx, fun_kwargs, defaults = getargspec(fun) - if defaults: - required_params = fun_params[1:-len(defaults)] - else: - required_params = fun_params[1:] - missing_params = set(required_params) - set(request_params) - if missing_params: - res = { - 'result': 'missing params', - 'missing': ', '.join(missing_params), - } - else: - if request_params: - request_params = dict( - (key, json_decode_fallback(value)) - for key, value in request_params.items() - if fun_kwargs or key in fun_params) - kwargs.update(stringify_keys(request_params)) - res = None - if login_required and not request.user.is_authenticated: - res = {'result': 'logout'} - if (permission_required and - not request.user.has_perm(permission_required)): - res = {'result': 'access denied'} - if not res: - try: - res = fun(request, **kwargs) - if res and template: - res = {'html': render_to_string(template, res, request=request)} - except AjaxError as e: - res = {'result': e.args[0]} - if 'result' not in res: - res['result'] = 'ok' - return HttpResponse(json_encode(res), content_type='application/json; charset=utf-8', - status=200 if res['result'] == 'ok' else 400) - - return ajax_view - - return decorator - - def send_noreply_mail(subject, message, recipient_list, **kwargs): send_mail( '[WolneLektury] ' + subject,