Admin fix.

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

diff --git a/src/wolnelektury/utils.py b/src/wolnelektury/utils.py
index c65a172..b0b9726 100644 (file)
--- a/src/wolnelektury/utils.py
+++ b/src/wolnelektury/utils.py
@@ -11,11 +11,15 @@ import os
 import pytz
 import re
 
 import pytz
 import re
 

+from django.conf import settings
+from django.core.cache import cache

 from django.core.mail import send_mail
 from django.http import HttpResponse
 from django.template.loader import render_to_string
 from django.utils import timezone
 from django.core.mail import send_mail
 from django.http import HttpResponse
 from django.template.loader import render_to_string
 from django.utils import timezone

+from django.utils.translation import get_language

 from django.conf import settings
 from django.conf import settings

+from django.utils.safestring import mark_safe

 from django.utils.translation import ugettext
 
 
 from django.utils.translation import ugettext
 
 


@@ -90,7 +94,7 @@ def ajax(login_required=False, method=None, template=None, permission_required=N
                         if fun_kwargs or key in fun_params)
                     kwargs.update(stringify_keys(request_params))
                 res = None
                         if fun_kwargs or key in fun_params)
                     kwargs.update(stringify_keys(request_params))
                 res = None

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

                     res = {'result': 'logout'}
                 if (permission_required and
                         not request.user.has_perm(permission_required)):
                     res = {'result': 'logout'}
                 if (permission_required and
                         not request.user.has_perm(permission_required)):


@@ -114,8 +118,8 @@ def ajax(login_required=False, method=None, template=None, permission_required=N
 
 def send_noreply_mail(subject, message, recipient_list, **kwargs):
     send_mail(
 
 def send_noreply_mail(subject, message, recipient_list, **kwargs):
     send_mail(

-        u'[WolneLektury] ' + subject,
-        message + u"\n\n-- \n" + ugettext(u'Message sent automatically. Please do not reply.'),
+        '[WolneLektury] ' + subject,
+        message + "\n\n-- \n" + ugettext('Message sent automatically. Please do not reply.'),

         'no-reply@wolnelektury.pl', recipient_list, **kwargs)
 
 
         'no-reply@wolnelektury.pl', recipient_list, **kwargs)
 
 


@@ -164,3 +168,42 @@ def is_crawler(request):
         return True
     user_agent = user_agent.lower()
     return any(bot_bit in user_agent for bot_bit in BOT_BITS)
         return True
     user_agent = user_agent.lower()
     return any(bot_bit in user_agent for bot_bit in BOT_BITS)

+
+
+def get_cached_render_key(instance, property_name, language=None):
+    if language is None:
+        language = get_language()
+    return 'cached_render:%s.%s:%s:%s' % (
+            type(instance).__name__,
+            property_name,
+            instance.pk,
+            language
+        )
+
+
+def cached_render(template_name, timeout=24 * 60 * 60):
+    def decorator(method):
+        @wraps(method)
+        def wrapper(self):
+            key = get_cached_render_key(self, method.__name__)
+            content = cache.get(key)
+            if content is None:
+                context = method(self)
+                content = render_to_string(template_name, context)
+                cache.set(key, str(content), timeout=timeout)
+            else:
+                content = mark_safe(content)
+            return content
+        return wrapper
+    return decorator
+
+
+def clear_cached_renders(bound_method):
+    for lc, ln in settings.LANGUAGES:
+        cache.delete(
+            get_cached_render_key(
+                bound_method.__self__,
+                bound_method.__name__,
+                lc
+            )
+        )