more informative erro message [error connecting to Solr]

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

diff --git a/apps/ajaxable/utils.py b/apps/ajaxable/utils.py
index 79eca52..4ae6e86 100755 (executable)
--- a/apps/ajaxable/utils.py
+++ b/apps/ajaxable/utils.py
@@ -4,13 +4,13 @@ from django.http import (HttpResponse, HttpResponseRedirect,
         HttpResponseForbidden)
 from django.shortcuts import render_to_response
 from django.template import RequestContext
         HttpResponseForbidden)
 from django.shortcuts import render_to_response
 from django.template import RequestContext

-from django.utils.cache import patch_vary_headers

 from django.utils.encoding import force_unicode
 from django.utils.functional import Promise
 from django.utils.http import urlquote_plus
 from django.utils import simplejson
 from django.utils.translation import ugettext_lazy as _
 from django.views.decorators.vary import vary_on_headers
 from django.utils.encoding import force_unicode
 from django.utils.functional import Promise
 from django.utils.http import urlquote_plus
 from django.utils import simplejson
 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(simplejson.JSONEncoder):
 
 
 class LazyEncoder(simplejson.JSONEncoder):


@@ -77,6 +77,7 @@ class AjaxableFormView(object):
     formname = "form"
     form_prefix = None
     full_template = "ajaxable/form_on_page.html"
     formname = "form"
     form_prefix = None
     full_template = "ajaxable/form_on_page.html"

+    honeypot = False

 
     @method_decorator(vary_on_headers('X-Requested-With'))
     def __call__(self, request, *args, **kwargs):
 
     @method_decorator(vary_on_headers('X-Requested-With'))
     def __call__(self, request, *args, **kwargs):


@@ -87,6 +88,11 @@ class AjaxableFormView(object):
             form_kwargs['prefix'] = self.form_prefix
 
         if request.method == "POST":
             form_kwargs['prefix'] = self.form_prefix
 
         if request.method == "POST":

+            if self.honeypot:
+                response = verify_honeypot_value(request, None)
+                if response:
+                    return response
+

             # do I need to be logged in?
             if self.POST_login and not request.user.is_authenticated():
                 return require_login(request)
             # do I need to be logged in?
             if self.POST_login and not request.user.is_authenticated():
                 return require_login(request)


@@ -95,14 +101,16 @@ class AjaxableFormView(object):
             form = self.form_class(*form_args, **form_kwargs)
             if form.is_valid():
                 add_args = self.success(form, request)
             form = self.form_class(*form_args, **form_kwargs)
             if form.is_valid():
                 add_args = self.success(form, request)

-                redirect = request.GET.get('next')
-                if not request.is_ajax() and redirect:
-                    return HttpResponseRedirect(urlquote_plus(
-                            redirect, safe='/?=&'))
-                response_data = {'success': True, 
-                    'message': self.success_message, 'redirect': redirect}
+                response_data = {
+                    'success': True, 
+                    'message': self.success_message,
+                    'redirect': request.GET.get('next')
+                    }

                 if add_args:
                     response_data.update(add_args)
                 if add_args:
                     response_data.update(add_args)

+                if not request.is_ajax() and response_data['redirect']:
+                    return HttpResponseRedirect(urlquote_plus(
+                            response_data['redirect'], safe='/?=&'))

             elif request.is_ajax():
                 # Form was sent with errors. Send them back.
                 if self.form_prefix:
             elif request.is_ajax():
                 # Form was sent with errors. Send them back.
                 if self.form_prefix:


@@ -137,6 +145,7 @@ class AjaxableFormView(object):
         context = {
                 self.formname: form, 
                 "title": title,
         context = {
                 self.formname: form, 
                 "title": title,

+                "honeypot": self.honeypot,

                 "placeholdize": self.placeholdize,
                 "submit": self.submit,
                 "response_data": response_data,
                 "placeholdize": self.placeholdize,
                 "submit": self.submit,
                 "response_data": response_data,


@@ -148,6 +157,16 @@ class AjaxableFormView(object):
         return render_to_response(template, context,
             context_instance=RequestContext(request))
 
         return render_to_response(template, context,
             context_instance=RequestContext(request))
 

+    def redirect_or_refresh(self, request, path, message=None):
+        """If the form is AJAX, refresh the page. If not, go to `path`.""" 
+        if request.is_ajax():
+            output = "<script>window.location.reload()</script>"
+            if message:
+                output = "<div class='normal-text'>" + message + "</div>" + output
+            return HttpResponse(output);
+        else:
+            return HttpResponseRedirect(path)
+

     def get_object(self, request, *args, **kwargs):
         """Override to parse view args and get some associated data."""
         return None
     def get_object(self, request, *args, **kwargs):
         """Override to parse view args and get some associated data."""
         return None