From c75b5e9386bd07972a8c0f58fd8213b9f31531e3 Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Fri, 4 May 2018 18:01:49 +0000 Subject: [PATCH] Use importantdates for material submisssion cutoff and revision if they exist. Fixes #2514. Commit ready for merge. - Legacy-Id: 15123 --- ietf/meeting/models.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/ietf/meeting/models.py b/ietf/meeting/models.py index d41e5d40b..d0bee085f 100644 --- a/ietf/meeting/models.py +++ b/ietf/meeting/models.py @@ -165,9 +165,18 @@ class Meeting(models.Model): def get_submission_start_date(self): return self.date - datetime.timedelta(days=self.submission_start_day_offset) def get_submission_cut_off_date(self): - return self.date + datetime.timedelta(days=self.submission_cutoff_day_offset) + importantdate = self.importantdate_set.filter(name_id='procsub').first() + if importantdate: + return importantdate.date + else: + return self.date + datetime.timedelta(days=self.submission_cutoff_day_offset) + def get_submission_correction_date(self): - return self.date + datetime.timedelta(days=self.submission_correction_day_offset) + importantdate = self.importantdate_set.filter(name_id='revsub').first() + if importantdate: + return importantdate.date + else: + return self.date + datetime.timedelta(days=self.submission_correction_day_offset) def get_schedule_by_name(self, name): return self.schedule_set.filter(name=name).first()