filter desk seminars if expiry_date < now

diff --git a/teleforma/context_processors.py b/teleforma/context_processors.py
index 0c89b9e5241e1482af6c34c91610261ef8482bc1..7010804e09f5e3da665d7d3cd671679072e9b6fa 100644 (file)
--- a/teleforma/context_processors.py
+++ b/teleforma/context_processors.py
@@ -79,6 +79,7 @@ def seminar_validated(user, seminar):
 
 def all_seminars(request, progress_order=False, date_order=False):
     seminars = []
+    now = datetime.datetime.now()
 
     if isinstance(request, User):
         user = request
@@ -97,15 +98,15 @@ def all_seminars(request, progress_order=False, date_order=False):
         courses = professor.courses.all()
 
         for course in courses:
-            for seminar in course.seminar.all():
+            for seminar in course.seminar.filter(expiry_date__gte=now):
                 seminars.append(seminar)
 
     elif auditor and not (user.is_staff or user.is_superuser):
         auditor = user.auditor.get()
-        seminars = auditor.seminars.filter(status=2)
+        seminars = auditor.seminars.filter(status=2, expiry_date__gte=now)
 
     elif user.is_staff or user.is_superuser:
-        seminars = Seminar.objects.all()
+        seminars = Seminar.objects.filter(expiry_date__gte=now)
     else:
         seminars = {}
 

diff --git a/teleforma/views/core.py b/teleforma/views/core.py
index 72fdd2169d3257b446ea1bc034d58a700c8d82ce..489d4e7ca7a1fb5d3f7f924757b4b93b367f18ef 100644 (file)
--- a/teleforma/views/core.py
+++ b/teleforma/views/core.py
@@ -40,6 +40,7 @@ import urllib2
 import json
 import os
 import StringIO
+import datetime
 
 from jsonrpc import jsonrpc_method