Showing/hiding main funding banner

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

diff --git a/apps/ajaxable/utils.py b/apps/ajaxable/utils.py
index 52cf638..2f03309 100755 (executable)
--- a/apps/ajaxable/utils.py
+++ b/apps/ajaxable/utils.py
@@ -7,13 +7,13 @@ from django.template import RequestContext
 from django.utils.encoding import force_unicode
 from django.utils.functional import Promise
 from django.utils.http import urlquote_plus
 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
+import json

 from django.utils.translation import ugettext_lazy as _
 from django.views.decorators.vary import vary_on_headers
 from honeypot.decorators import verify_honeypot_value
 
 
 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(json.JSONEncoder):

     def default(self, obj):
         if isinstance(obj, Promise):
             return force_unicode(obj)
     def default(self, obj):
         if isinstance(obj, Promise):
             return force_unicode(obj)


@@ -24,7 +24,7 @@ class JSONResponse(HttpResponse):
     def __init__(self, data={}, callback=None, **kwargs):
         # get rid of mimetype
         kwargs.pop('mimetype', None)
     def __init__(self, data={}, callback=None, **kwargs):
         # get rid of mimetype
         kwargs.pop('mimetype', None)

-        data = simplejson.dumps(data)
+        data = json.dumps(data)

         if callback:
             data = callback + "(" + data + ");" 
         super(JSONResponse, self).__init__(data, mimetype="application/json", **kwargs)
         if callback:
             data = callback + "(" + data + ");" 
         super(JSONResponse, self).__init__(data, mimetype="application/json", **kwargs)


@@ -101,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: