Remove hotjar.

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

diff --git a/src/ajaxable/utils.py b/src/ajaxable/utils.py
index 80d398f..164feac 100755 (executable)
--- a/src/ajaxable/utils.py
+++ b/src/ajaxable/utils.py
@@ -1,13 +1,11 @@
-# -*- coding: utf-8 -*-

 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from functools import wraps
 
 from django.http import HttpResponse, HttpResponseRedirect, HttpResponseForbidden
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 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 +17,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
 
 


@@ -77,6 +75,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


@@ -88,7 +91,7 @@ class AjaxableFormView(object):
                     return response
 
             # do I need to be logged in?
                     return response
 
             # do I need to be logged in?

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

                 return require_login(request)
 
             form_kwargs['data'] = request.POST
                 return require_login(request)
 
             form_kwargs['data'] = request.POST


@@ -119,7 +122,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)


@@ -148,7 +151,10 @@ class AjaxableFormView(object):
                 "view_kwargs": kwargs,
             }
         context.update(self.extra_context(request, obj))
                 "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`."""