X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/6e3e08e5354baaf82f7d46cbd88883e4c7426dce..05b7014d1d710937c6a4b5cdccdb4890f377818d:/src/ajaxable/utils.py?ds=sidebyside diff --git a/src/ajaxable/utils.py b/src/ajaxable/utils.py index 8052e6ba6..8e34a9a57 100755 --- a/src/ajaxable/utils.py +++ b/src/ajaxable/utils.py @@ -5,9 +5,8 @@ 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.utils.encoding import force_unicode +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 @@ -19,7 +18,7 @@ from honeypot.decorators import verify_honeypot_value class LazyEncoder(json.JSONEncoder): def default(self, obj): if isinstance(obj, Promise): - return force_unicode(obj) + return force_text(obj) return obj @@ -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 @@ -153,7 +152,7 @@ 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