From: Guillaume Pellerin <yomguy@parisson.com>
Date: Sun, 15 Dec 2013 21:18:27 +0000 (+0100)
Subject: filter desk seminars if expiry_date < now
X-Git-Tag: 2.8.1-pro~460
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=8b7044aa4818b35f643f1e6e9beedb0d8fb26bdd;p=teleforma.git

filter desk seminars if expiry_date < now
---

diff --git a/teleforma/context_processors.py b/teleforma/context_processors.py
index 0c89b9e5..7010804e 100644
--- 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 72fdd216..489d4e7c 100644
--- 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