Improve anonymous page cache

Author: stefanw

correctiv_justizgelder/urls.py

@@ -1,31 +1,21 @@
+from functools import wraps
+
 from django.conf.urls import patterns, url
 from django.utils.translation import ugettext_lazy as _
-from django.utils.decorators import decorator_from_middleware_with_args
-from django.middleware.cache import CacheMiddleware
+from django.views.decorators.cache import cache_page
 
 from .views import OrganisationSearchView, OrganisationDetail
 
 CACHE_TIME = 15 * 60
 
 
-def cache_page_anonymous(*args, **kwargs):
-    """
-    Decorator to cache Django views only for anonymous users.
-    Use just like the decorator cache_page:
-
-    @cache_page_anonymous(60 * 30)  # cache for 30 mins
-    def your_view_here(request):
-        ...
-    """
-    key_prefix = kwargs.pop('key_prefix', None)
-    return decorator_from_middleware_with_args(CacheMiddleware)(
-        cache_timeout=args[0],
-        key_prefix=key_prefix,
-        cache_anonymous_only=True)
-
-
 def c(view):
-    return cache_page_anonymous(CACHE_TIME)(view)
+    @wraps(view)
+    def cache_page_anonymous(request, *args, **kwargs):
+        if request.user.is_authenticated():
+            return view(request, *args, **kwargs)
+        return cache_page(CACHE_TIME)(view)(request, *args, **kwargs)
+    return cache_page_anonymous
 
 
 urlpatterns = patterns('',