X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/652e2d66d7f88cc6b857edc4aaac7e14a654eb36..64af15fe792f42d3a7dc3e857a45577d16806255:/src/ajaxable/utils.py diff --git a/src/ajaxable/utils.py b/src/ajaxable/utils.py index 9fd009108..89dd0e2d9 100755 --- a/src/ajaxable/utils.py +++ b/src/ajaxable/utils.py @@ -5,8 +5,7 @@ from functools import wraps from django.http import HttpResponse, HttpResponseRedirect, HttpResponseForbidden -from django.shortcuts import render_to_response -from django.template import RequestContext +from django.shortcuts import render from django.utils.encoding import force_unicode from django.utils.functional import Promise from django.utils.http import urlquote_plus @@ -48,7 +47,7 @@ def require_login(request): 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 @@ -77,6 +76,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 @@ -148,7 +152,10 @@ class AjaxableFormView(object): "view_kwargs": kwargs, } context.update(self.extra_context(request, obj)) - return render_to_response(template, context, context_instance=RequestContext(request)) + return render(request, template, context) + + 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`."""