add settings.CACHE_TIMEOUT

diff --git a/app/settings.py b/app/settings.py
index 30d09b42950682a493d2a323312941f1b6101e33..c1c6113ef4bf78103e66cc09dac7e6e69471294f 100644 (file)
--- a/app/settings.py
+++ b/app/settings.py
@@ -302,7 +302,7 @@ CACHES = {
    }
 }
 
-CACHE_TIMEOUT = None
+CACHE_TIMEOUT = 60*60*12
 
 # 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/teleforma/urls.py b/teleforma/urls.py
index 3cf268e00d2c1b94cb8c7911a3831ba752315655..dfc2575df6b4ba0629c4a1bd0184d1dfbb21c69f 100644 (file)
--- a/teleforma/urls.py
+++ b/teleforma/urls.py
@@ -76,8 +76,6 @@ media = MediaView()
 home_view = HomeView()
 media_transcoded = MediaTranscodedView()
 
-CACHE_TIMEOUT = getattr(settings, 'CACHE_TIMEOUT', 300)
-
 
 urlpatterns = [
     # login / logout

diff --git a/teleforma/views/core.py b/teleforma/views/core.py
index ce31a7bef9271b4a67da2f8570ea4befa2469963..5199ec0d61016e0e10cbbce1e604c1807957b975 100644 (file)
--- a/teleforma/views/core.py
+++ b/teleforma/views/core.py
@@ -86,6 +86,8 @@ from .pages import get_page_content
 #     return django_render(template, data, context_instance=RequestContext(request),
 #                          mimetype=mimetype)
 
+# CACHE_TIMEOUT = getattr(settings, 'CACHE_TIMEOUT', 60*60)
+
 
 def format_courses(courses, course=None, queryset=None, types=None):
     if queryset:
@@ -110,7 +112,7 @@ def get_courses(user, date_order=False, num_order=False, num_courses=False, peri
         from teleforma.views.crfpa import get_crfpa_courses
         result = get_crfpa_courses(user, date_order, num_order, period)
         # cache for one hour
-        cache.set(cache_key, result, 60 * 60)
+        cache.set(cache_key, result, settings.CACHE_TIMEOUT)
         return result
 
     elif settings.TELEFORMA_E_LEARNING_TYPE == 'AE':