Necessary rounding.

[wolnelektury.git] / src / ajaxable / utils.py

diff --git a/src/ajaxable/utils.py b/src/ajaxable/utils.py
index c2c3688..8e34a9a 100755 (executable)
--- 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 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
 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):
 class LazyEncoder(json.JSONEncoder):
     def default(self, obj):
         if isinstance(obj, Promise):

-            return force_unicode(obj)
+            return force_text(obj)

         return obj
 
 
         return obj
 
 


@@ -48,7 +47,7 @@ def require_login(request):
 
 def placeholdized(form):
     for field in form.fields.values():
 
 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
 
 
     return form
 
 


@@ -63,6 +62,7 @@ class AjaxableFormView(object):
     # override to customize form look
     template = "ajaxable/form.html"
     submit = _('Send')
     # override to customize form look
     template = "ajaxable/form.html"
     submit = _('Send')

+    action = ''

 
     title = ''
     success_message = ''
 
     title = ''
     success_message = ''


@@ -76,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)
     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
         form_args, form_kwargs = self.form_args(request, obj)
         if self.form_prefix:
             form_kwargs['prefix'] = self.form_prefix


@@ -140,13 +145,17 @@ class AjaxableFormView(object):
                 "honeypot": self.honeypot,
                 "placeholdize": self.placeholdize,
                 "submit": self.submit,
                 "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))
                 "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(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`."""
 
     def redirect_or_refresh(self, request, path, message=None):
         """If the form is AJAX, refresh the page. If not, go to `path`."""