X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/357027375ff8867f42ca34bcbfb5a78b5b185fc3..5b312d5dfc897d291d4d4ed159fc25d7f5493d41:/src/ajaxable/utils.py?ds=sidebyside diff --git a/src/ajaxable/utils.py b/src/ajaxable/utils.py index 89b56228d..82de84771 100755 --- a/src/ajaxable/utils.py +++ b/src/ajaxable/utils.py @@ -4,8 +4,7 @@ # from functools import wraps -from django.http import (HttpResponse, HttpResponseRedirect, - HttpResponseForbidden) +from django.http import HttpResponse, HttpResponseRedirect, HttpResponseForbidden from django.shortcuts import render_to_response from django.template import RequestContext from django.utils.encoding import force_unicode @@ -44,12 +43,12 @@ def require_login(request): 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): for field in form.fields.values(): - field.widget.attrs['placeholder'] = field.label + field.widget.attrs['placeholder'] = field.label + ('*' if field.required else '') return form @@ -64,6 +63,7 @@ class AjaxableFormView(object): # override to customize form look template = "ajaxable/form.html" submit = _('Send') + action = '' title = '' success_message = '' @@ -77,6 +77,11 @@ class AjaxableFormView(object): def __call__(self, request, *args, **kwargs): """A view displaying a form, or JSON if request is AJAX.""" obj = self.get_object(request, *args, **kwargs) + + response = self.validate_object(obj, request) + if response: + return response + form_args, form_kwargs = self.form_args(request, obj) if self.form_prefix: form_kwargs['prefix'] = self.form_prefix @@ -119,8 +124,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) @@ -142,14 +146,17 @@ class AjaxableFormView(object): "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_to_response(template, context, - context_instance=RequestContext(request)) + return render_to_response(template, context, context_instance=RequestContext(request)) + + def validate_object(self, obj, request): + return None def redirect_or_refresh(self, request, path, message=None): """If the form is AJAX, refresh the page. If not, go to `path`."""