diff --git a/ietf/submit/forms.py b/ietf/submit/forms.py
index 8d83eb9fa..caf674f13 100644
--- a/ietf/submit/forms.py
+++ b/ietf/submit/forms.py
@@ -93,6 +93,11 @@ class SubmissionBaseUploadForm(forms.Form):
cutoff_00_str = cutoff_00.strftime("%Y-%m-%d %H:%M %Z")
cutoff_01_str = cutoff_01.strftime("%Y-%m-%d %H:%M %Z")
reopen_str = reopen.strftime("%Y-%m-%d %H:%M %Z")
+
+ # Workaround for IETF107. This would be better handled by a refactor that allowed meetings to have no cutoff period.
+ if cutoff_01 >= reopen:
+ return
+
if cutoff_00 == cutoff_01:
if now.date() >= (cutoff_00.date() - meeting.idsubmit_cutoff_warning_days) and now.date() < cutoff_00.date():
self.cutoff_warning = ( 'The last submission time for Internet-Drafts before %s is %s.
' % (meeting, cutoff_00_str))
diff --git a/ietf/submit/tests.py b/ietf/submit/tests.py
index cbfde5e3f..115257938 100644
--- a/ietf/submit/tests.py
+++ b/ietf/submit/tests.py
@@ -1008,6 +1008,40 @@ class SubmitTests(TestCase):
q = PyQuery(r.content)
self.assertEqual(len(q('input[type=file][name=txt]')), 1)
+ def test_no_blackout_at_all(self):
+ url = urlreverse('ietf.submit.views.upload_submission')
+
+ meeting = Meeting.get_current_meeting()
+ meeting.date = datetime.date.today()+datetime.timedelta(days=7)
+ meeting.save()
+ meeting.importantdate_set.filter(name_id='idcutoff').delete()
+ meeting.importantdate_set.create(name_id='idcutoff', date=datetime.date.today()+datetime.timedelta(days=7))
+ r = self.client.get(url)
+ self.assertEqual(r.status_code,200)
+ q = PyQuery(r.content)
+ self.assertEqual(len(q('input[type=file][name=txt]')), 1)
+
+ meeting = Meeting.get_current_meeting()
+ meeting.date = datetime.date.today()
+ meeting.save()
+ meeting.importantdate_set.filter(name_id='idcutoff').delete()
+ meeting.importantdate_set.create(name_id='idcutoff', date=datetime.date.today())
+ r = self.client.get(url)
+ self.assertEqual(r.status_code,200)
+ q = PyQuery(r.content)
+ self.assertEqual(len(q('input[type=file][name=txt]')), 1)
+
+ meeting = Meeting.get_current_meeting()
+ meeting.date = datetime.date.today()-datetime.timedelta(days=1)
+ meeting.save()
+ meeting.importantdate_set.filter(name_id='idcutoff').delete()
+ meeting.importantdate_set.create(name_id='idcutoff', date=datetime.date.today()-datetime.timedelta(days=1))
+ r = self.client.get(url)
+ self.assertEqual(r.status_code,200)
+ q = PyQuery(r.content)
+ self.assertEqual(len(q('input[type=file][name=txt]')), 1)
+
+
def submit_bad_file(self, name, formats):
rev = ""
group = None