Fix expected revision for expired drafts. Fixes #656

- Legacy-Id: 3078

ietf/submit/forms.py

@@ -409,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

ietf/submit/utils.py

@@ -220,7 +220,7 @@ class DraftValidation(object):
         if self.draft.status_id in [POSTED, POSTED_BY_SECRETARIAT]:
             return
         revision = self.draft.revision
-        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