more cached views

diff --git a/app/settings.py b/app/settings.py
index ab45e6863aa6caf903bfce2ff6099c0e8e304585..62b16b0c66ae894a8c65011151afeacdd39c1d15 100644 (file)
--- a/app/settings.py
+++ b/app/settings.py
@@ -293,7 +293,7 @@ CACHES = {
    }
 }
 
-CACHE_TIMEOUT = 300
+CACHE_TIMEOUT = 120
 
 # Name of cache backend to cache user agents. If it not specified default
 # cache alias will be used. Set to `None` to disable caching.

diff --git a/bin b/bin
index c5d2023de2f038cb865a148076a4dc4ec24efaf7..52d01bc8d0ec34d96ae3751fa5709a8ae05066fd 160000 (submodule)
--- a/bin
+++ b/bin
@@ -1 +1 @@
-Subproject commit c5d2023de2f038cb865a148076a4dc4ec24efaf7
+Subproject commit 52d01bc8d0ec34d96ae3751fa5709a8ae05066fd

diff --git a/teleforma/urls.py b/teleforma/urls.py
index d049e12deff2c97611cb55788d2f912483ff44f3..1fc563fd9c0750ae998787bb4b232bf2efba23cf 100644 (file)
--- a/teleforma/urls.py
+++ b/teleforma/urls.py
@@ -35,6 +35,7 @@
 import os.path
 
 from django.conf.urls import include, url
+from django.conf import settings
 from django.urls import path
 from django.contrib.auth.views import (LoginView, LogoutView,
                                        PasswordChangeDoneView,
@@ -150,7 +151,8 @@ urlpatterns = [
         cache_page(CACHE_TIMEOUT)(CourseListView.as_view()), name="teleforma-desk-period-list"),
     url(r'^desk/periods/(?P<period_id>.*)/courses_pending/$',
         CoursePendingListView.as_view(), name="teleforma-desk-period-pending"),
-    url(r'^desk/periods/(?P<period_id>.*)/courses/(?P<pk>.*)/detail/$', CourseView.as_view(),
+    url(r'^desk/periods/(?P<period_id>.*)/courses/(?P<pk>.*)/detail/$', 
+        cache_page(CACHE_TIMEOUT)(CourseView.as_view()),
         name="teleforma-desk-period-course"),
 
 
@@ -161,7 +163,8 @@ urlpatterns = [
     url(r'^desk/periods/(?P<period_id>.*)/medias/transcode/(?P<pk>.*)/stream/$',
         media_transcoded.stream, name="teleforma-media-transcoded-stream"),
     url(r'^desk/periods/(?P<period_id>.*)/medias/(?P<pk>.*)/detail/$',
-        MediaView.as_view(), name="teleforma-media-detail"),
+        cache_page(CACHE_TIMEOUT)(MediaView.as_view()), 
+        name="teleforma-media-detail"),
     url(r'^desk/periods/(?P<period_id>.*)/medias/(?P<pk>.*)/embed/$',
         MediaViewEmbed.as_view(), name="teleforma-media-embed"),
     url(r'^desk/periods/(?P<period_id>.*)/medias/(?P<pk>.*)/download/$',
@@ -176,7 +179,8 @@ urlpatterns = [
     url(r'^desk/documents/(?P<pk>.*)/view/$', document.view,
         name="teleforma-document-view"),
 
-    url(r'^archives/annals/$', AnnalsView.as_view(),
+    url(r'^archives/annals/$', 
+        cache_page(CACHE_TIMEOUT)(AnnalsView.as_view()),
         name="teleforma-annals"),
     url(r'^archives/annals/by-iej/(\w+)/$',
         AnnalsIEJView.as_view(), name="teleforma-annals-iej"),
@@ -187,7 +191,7 @@ urlpatterns = [
         cache_page(CACHE_TIMEOUT)(ConferenceView.as_view()),
         name="teleforma-conference-detail"),
     url(r'^desk/periods/(?P<period_id>.*)/conferences/(?P<pk>.*)/audio/$',
-        cache_page(CACHE_TIMEOUT)ConferenceView.as_view(
+        cache_page(CACHE_TIMEOUT)(ConferenceView.as_view(
             template_name="teleforma/course_conference_audio.html")
         ),
         name="teleforma-conference-audio"),