diff --git a/ietf/settings.py b/ietf/settings.py index 60ed1fb9e..f00a3bad8 100644 --- a/ietf/settings.py +++ b/ietf/settings.py @@ -196,6 +196,8 @@ LIAISON_ATTACH_URL = '/documents/LIAISON/' # ID Submission Tool settings IDSUBMIT_FROM_EMAIL = 'IETF I-D Submission Tool ' IDSUBMIT_TO_EMAIL = 'internet-drafts@ietf.org' +IDST_ID_EMAIL = 'Internet-Drafts@ietf.org' +IDST_ID_ANNOUNCE_LIST = 'i-d-announce@ietf.org' # Days from meeting to cut off dates on submit FIRST_CUTOFF_DAYS = 5 diff --git a/ietf/submit/forms.py b/ietf/submit/forms.py index c16a9d5de..5f5b0a64d 100644 --- a/ietf/submit/forms.py +++ b/ietf/submit/forms.py @@ -392,9 +392,8 @@ class MetaDataForm(AutoPostForm): if not creation_date: return None submit_date = self.draft.submission_date - if creation_date > submit_date: - raise forms.ValidationError('Creation Date must not be set after submission date') - if creation_date + datetime.timedelta(days=3) < submit_date: + if (creation_date + datetime.timedelta(days=3) < submit_date or + creation_date - datetime.timedelta(days=3) > submit_date): raise forms.ValidationError('Creation Date must be within 3 days of submission date') return creation_date @@ -410,7 +409,7 @@ class MetaDataForm(AutoPostForm): raise forms.ValidationError('Version field is not in NN format') if version_int > 99 or version_int < 0: raise forms.ValidationError('Version must be set between 00 and 99') - existing_revisions = [int(i.revision) for i in InternetDraft.objects.filter(filename=self.draft.filename)] + existing_revisions = [int(i.revision_display()) for i in InternetDraft.objects.filter(filename=self.draft.filename)] expected = 0 if existing_revisions: expected = max(existing_revisions) + 1 diff --git a/ietf/submit/templatetags/submit_tags.py b/ietf/submit/templatetags/submit_tags.py index d3e271a20..e6d004661 100644 --- a/ietf/submit/templatetags/submit_tags.py +++ b/ietf/submit/templatetags/submit_tags.py @@ -23,7 +23,7 @@ def show_two_pages(context, two_pages, validation): @register.filter def two_pages_decorated_with_validation(value, validation): - pages = value.first_two_pages + pages = value.first_two_pages or '' if not 'revision' in validation.warnings.keys(): return mark_safe('' % pages) result = '