use period.id for courses caching

diff --git a/lib/Django-Quiz b/lib/Django-Quiz
deleted file mode 160000 (submodule)
index 0109d89..0000000
--- a/lib/Django-Quiz
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0109d89679ebf98e9f61369d7dca12d0c6d1a6c0

diff --git a/teleforma/models/crfpa.py b/teleforma/models/crfpa.py
index 35f77ca304f624840be6b286e5f176811c1c8028..14d4e3c18db05873d533c27e5af3fd93745cce0f 100644 (file)
--- a/teleforma/models/crfpa.py
+++ b/teleforma/models/crfpa.py
@@ -437,7 +437,7 @@ def purge_courses_cache(sender, instance, *args, **kwargs):
         for date_order in (True, False):
             for num_order in (True, False):
                 for num_courses in (True, False):
-                    cache_key = f"get_courses-{instance.user.id}-{date_order}-{num_order}-{num_courses}-{period and period.id or None}"
+                    cache_key = f"get_courses-{instance.user.id}-{date_order}-{num_order}-{num_courses}-{period.id or None}"
                     # print(f"purging {cache_key}")
                     cache.delete(cache_key)
 

diff --git a/teleforma/templates/teleforma/base.html b/teleforma/templates/teleforma/base.html
index 4add03819206e23d9c5bc525b7423ad487ba6a88..13eef8623df09121b0a7a93aab93dbde07a74a38 100644 (file)
--- a/teleforma/templates/teleforma/base.html
+++ b/teleforma/templates/teleforma/base.html
@@ -17,18 +17,11 @@
 
   {% block stylesheets %}
 
-
   <link rel="stylesheet" type="text/css" href="/static/teleforma/css/base.css?v={% teleforma_version %}" />
   <link rel="stylesheet" type="text/css" href="/static/teleforma/css/teleforma.css?v={% teleforma_version %}" />
 
   {% webpack 'app.css' %}
 
-  <!--[if IE]>
-<link rel="stylesheet" type="text/css" href="/static/teleforma/css/teleforma_ie.css" />
-<![endif]-->
-  <!--[if lte IE 6]>
-<link rel="stylesheet"type="text/css" href="/static/teleforma/css/teleforma_ie6.css" />
-<![endif]-->
   {% endblock %}
 
   {% block extra_stylesheets %}{% endblock %}
@@ -38,10 +31,6 @@
   <script src="/static/teleforma/js/jquery-1.6.min.js" type="text/javascript"></script>
   <script src="/static/teleforma/js/jquery-ui.js" type="text/javascript"></script>
   <script src="/static/teleforma/js/jquery.expander.min.js" type="text/javascript"></script>
-<!--   <script src="https://code.jquery.com/jquery-3.7.1.min.js" type="text/javascript"></script>
-  <script src="https://code.jquery.com/ui/1.14.0/jquery-ui.min.js" type="text/javascript"></script>
-  <script src="https://cdn.jsdelivr.net/npm/jquery-expander@2.0.2/jquery.expander.min.js" type="text/javascript"></script>
- -->
   <script src="/static/teleforma/js/messi.min.js" type="text/javascript"></script>
   <script src="/static/teleforma/js/rainbowvis.js" type="text/javascript"></script>
   <script src="/static/teleforma/js/locale.js" type="text/javascript"></script>
@@ -67,7 +56,6 @@
     {% block header %}
     <div id="header">
 
-
       <div id="menu">
         <div id="logo_wrapper">
           <div id="logo">

diff --git a/teleforma/views/core.py b/teleforma/views/core.py
index c609141a230bbb16dfeb334056c241cef588a39d..b6125bb9b2a644828957f7ad63f4760c00e4fa31 100644 (file)
--- a/teleforma/views/core.py
+++ b/teleforma/views/core.py
@@ -103,7 +103,7 @@ def format_courses(courses, course=None, queryset=None, types=None):
 
 
 def get_courses(user, date_order=False, num_order=False, num_courses=False, period=None):
-    cache_key = f"get_courses-{user.id}-{date_order}-{num_order}-{num_courses}-{period and period.id or None}"
+    cache_key = f"get_courses-{user.id}-{date_order}-{num_order}-{num_courses}-{period.id or None}"
     cached_value = cache.get(cache_key)
     if cached_value:
         return cached_value