]> git.parisson.com Git - teleforma.git/commitdiff
Now, revisions time doesn't apply to expired seminars https://trackers.pilotsystems...
authorYoan Le Clanche <yoanl@pilotsystems.net>
Wed, 12 Feb 2020 09:34:11 +0000 (10:34 +0100)
committerYoan Le Clanche <yoanl@pilotsystems.net>
Wed, 12 Feb 2020 09:34:11 +0000 (10:34 +0100)
teleforma/views/pro.py

index 9292c5a3f53799a810dbeb7d1eeef5dad7227d1d..8e3f524e6671526c3cbd2b57e2291996e613b40a 100644 (file)
@@ -152,6 +152,9 @@ class SeminarRevisionMixin(object):
         seminar = Seminar.objects.get(id=id)
         user = User.objects.get(username=username)
         all_revisions = SeminarRevision.objects.filter(user=user, date__gte=REVISION_DATE_FILTER, date_modified=None)
+        now = datetime.datetime.now()
+        if seminar.expiry_date < now:
+            return
         if all_revisions:
             if not all_revisions[0].seminar == seminar:
                 revisions = all_revisions.filter(seminar=seminar)
@@ -168,6 +171,8 @@ class SeminarRevisionMixin(object):
         user = User.objects.get(username=username)
         all_revisions = SeminarRevision.objects.filter(user=user, date__gte=REVISION_DATE_FILTER, date_modified=None)
         now = datetime.datetime.now()
+        if seminar.expiry_date < now:
+            now = seminar.expiry_date
         if all_revisions:
             revisions = all_revisions.filter(seminar=seminar)
             if revisions:
@@ -179,6 +184,7 @@ class SeminarRevisionMixin(object):
         seminar_revisions = SeminarRevision.objects.filter(user=user, date__gte=REVISION_DATE_FILTER, seminar=seminar)
         if seminar_revisions:
             revision = seminar_revisions.latest('date')
+
             if (now - revision.date) > datetime.timedelta(seconds=1):
                 revision.date_modified = now
                 revision.save()