X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/967eed676fc83d15b26149047f353ac61faa8217..5ae011626f0d613dc7ca667c25c95d9cc4a1ab47:/src/ajaxable/utils.py?ds=sidebyside diff --git a/src/ajaxable/utils.py b/src/ajaxable/utils.py old mode 100755 new mode 100644 index 8e34a9a57..f8e99cece --- a/src/ajaxable/utils.py +++ b/src/ajaxable/utils.py @@ -1,25 +1,24 @@ -# -*- coding: utf-8 -*- # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later. # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # from functools import wraps +import json from django.http import HttpResponse, HttpResponseRedirect, HttpResponseForbidden from django.shortcuts import render from django.utils.encoding import force_text from django.utils.functional import Promise from django.utils.http import urlquote_plus -import json from django.utils.translation import ugettext_lazy as _ from django.views.decorators.vary import vary_on_headers from honeypot.decorators import verify_honeypot_value class LazyEncoder(json.JSONEncoder): - def default(self, obj): - if isinstance(obj, Promise): - return force_text(obj) - return obj + def default(self, o): + if isinstance(o, Promise): + return force_text(o) + return o def method_decorator(function_decorator): @@ -41,8 +40,7 @@ def require_login(request): """Return 403 if request is AJAX. Redirect to login page if not.""" if request.is_ajax(): return HttpResponseForbidden('Not logged in') - else: - return HttpResponseRedirect('/uzytkownicy/zaloguj') # next?=request.build_full_path()) + return HttpResponseRedirect('/uzytkownicy/zaloguj') # next?=request.build_full_path()) def placeholdized(form): @@ -51,7 +49,7 @@ def placeholdized(form): return form -class AjaxableFormView(object): +class AjaxableFormView: """Subclass this to create an ajaxable view for any form. In the subclass, provide at least form_class. @@ -92,7 +90,7 @@ class AjaxableFormView(object): return response # do I need to be logged in? - if self.POST_login and not request.user.is_authenticated(): + if self.POST_login and not request.user.is_authenticated: return require_login(request) form_kwargs['data'] = request.POST @@ -108,7 +106,7 @@ class AjaxableFormView(object): response_data.update(add_args) if not request.is_ajax() and response_data['redirect']: return HttpResponseRedirect(urlquote_plus( - response_data['redirect'], safe='/?=&')) + response_data['redirect'], safe='/?=&')) elif request.is_ajax(): # Form was sent with errors. Send them back. if self.form_prefix: @@ -123,7 +121,7 @@ class AjaxableFormView(object): if request.is_ajax(): return HttpResponse(LazyEncoder(ensure_ascii=False).encode(response_data)) else: - if self.POST_login and not request.user.is_authenticated() and not request.is_ajax(): + if self.POST_login and not request.user.is_authenticated and not request.is_ajax(): return require_login(request) form = self.form_class(*form_args, **form_kwargs) @@ -140,17 +138,17 @@ class AjaxableFormView(object): if self.placeholdize: form = placeholdized(form) context = { - self.formname: form, - "title": title, - "honeypot": self.honeypot, - "placeholdize": self.placeholdize, - "submit": self.submit, - "action": self.action, - "response_data": response_data, - "ajax_template": self.template, - "view_args": args, - "view_kwargs": kwargs, - } + self.formname: form, + "title": title, + "honeypot": self.honeypot, + "placeholdize": self.placeholdize, + "submit": self.submit, + "action": self.action, + "response_data": response_data, + "ajax_template": self.template, + "view_args": args, + "view_kwargs": kwargs, + } context.update(self.extra_context(request, obj)) return render(request, template, context) @@ -164,8 +162,7 @@ class AjaxableFormView(object): if message: output = "
" + message + "
" + output return HttpResponse(output) - else: - return HttpResponseRedirect(path) + return HttpResponseRedirect(path) def get_object(self, request, *args, **kwargs): """Override to parse view args and get some associated data."""