Revert "turn on banner for 1%"

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

diff --git a/src/ajaxable/utils.py b/src/ajaxable/utils.py
index 89b5622..9fd0091 100755 (executable)
--- a/src/ajaxable/utils.py
+++ b/src/ajaxable/utils.py
@@ -4,8 +4,7 @@
 #
 from functools import wraps
 
 #
 from functools import wraps
 

-from django.http import (HttpResponse, HttpResponseRedirect,
-        HttpResponseForbidden)
+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_to_response
 from django.template import RequestContext
 from django.utils.encoding import force_unicode


@@ -44,7 +43,7 @@ def require_login(request):
     if request.is_ajax():
         return HttpResponseForbidden('Not logged in')
     else:
     if request.is_ajax():
         return HttpResponseForbidden('Not logged in')
     else:

-        return HttpResponseRedirect('/uzytkownicy/zaloguj')# next?=request.build_full_path())
+        return HttpResponseRedirect('/uzytkownicy/zaloguj')  # next?=request.build_full_path())

 
 
 def placeholdized(form):
 
 
 def placeholdized(form):


@@ -64,6 +63,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 = ''


@@ -119,8 +119,7 @@ class AjaxableFormView(object):
             if request.is_ajax():
                 return HttpResponse(LazyEncoder(ensure_ascii=False).encode(response_data))
         else:
             if request.is_ajax():
                 return HttpResponse(LazyEncoder(ensure_ascii=False).encode(response_data))
         else:

-            if (self.POST_login and not request.user.is_authenticated()
-                    and not request.is_ajax()):
+            if self.POST_login and not request.user.is_authenticated() and not request.is_ajax():

                 return require_login(request)
 
             form = self.form_class(*form_args, **form_kwargs)
                 return require_login(request)
 
             form = self.form_class(*form_args, **form_kwargs)


@@ -142,14 +141,14 @@ 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_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`."""
 
     def redirect_or_refresh(self, request, path, message=None):
         """If the form is AJAX, refresh the page. If not, go to `path`."""