Add approval/pre-approval page for Secretariat and WG Chairs, with

subpages for adding and canceling pre-approvals and a set of
migrations for replacing the old IdApprovedDetail with a slightly less
confusing Preapproval model.
 - Legacy-Id: 4411

Author: OleLaursen

ietf/submit/admin.py

@@ -21,9 +21,9 @@ def status_link(self, instance):
 
 admin.site.register(IdSubmissionDetail, IdSubmissionDetailAdmin)
 
-class IdApprovedDetailAdmin(admin.ModelAdmin):
+class PreapprovalAdmin(admin.ModelAdmin):
     pass
-admin.site.register(IdApprovedDetail, IdApprovedDetailAdmin)    
+admin.site.register(Preapproval, PreapprovalAdmin)
 
 class TempIdAuthorsAdmin(admin.ModelAdmin):
     ordering = ["-id"]

ietf/submit/forms.py

@@ -14,8 +14,8 @@
 
 from ietf.idtracker.models import InternetDraft, IETFWG
 from ietf.proceedings.models import Meeting
-from ietf.submit.models import IdSubmissionDetail, TempIdAuthors
-from ietf.submit.utils import MANUAL_POST_REQUESTED, NONE_WG, UPLOADED, WAITING_AUTHENTICATION
+from ietf.submit.models import IdSubmissionDetail, TempIdAuthors, Preapproval
+from ietf.submit.utils import MANUAL_POST_REQUESTED, NONE_WG, UPLOADED, WAITING_AUTHENTICATION, POSTED, POSTED_BY_SECRETARIAT
 from ietf.submit.parsers.pdf_parser import PDFParser
 from ietf.submit.parsers.plain_parser import PlainParser
 from ietf.submit.parsers.ps_parser import PSParser
@@ -547,3 +547,33 @@ def send_mail_to_secretariat(self, request):
                 'submitter': submitter
                 },
                   cc=cc)
+
+
+class PreapprovalForm(forms.Form):
+    name = forms.CharField(max_length=255, required=True, label="Pre-approved name", initial="draft-ietf-")
+
+    def clean_name(self):
+        n = self.cleaned_data['name'].strip().lower()
+
+        if not n.startswith("draft-"):
+            raise forms.ValidationError("Name doesn't start with \"draft-\".")
+        if len(n.split(".")) > 1 and len(n.split(".")[-1]) == 3:
+            raise forms.ValidationError("Name appears to end with a file extension .%s - do not include an extension." % n.split(".")[-1])
+
+        components = n.split("-")
+        if components[-1] == "00":
+            raise forms.ValidationError("Name appears to end with a revision number -00 - do not include the revision.")
+        if len(components) < 4:
+            raise forms.ValidationError("Name has less than four dash-delimited components - can't form a valid WG draft name.")
+        if not components[-1]:
+            raise forms.ValidationError("Name ends with a dash.")
+        acronym = components[2]
+        if acronym not in self.groups.values_list('acronym', flat=True):
+            raise forms.ValidationError("WG acronym not recognized as one you can approve drafts for.")
+
+        if Preapproval.objects.filter(name=n):
+            raise forms.ValidationError("Pre-approval for this name already exists.")
+        if IdSubmissionDetail.objects.filter(status__in=[POSTED, POSTED_BY_SECRETARIAT ], filename=n):
+            raise forms.ValidationError("A draft with this name has already been submitted and accepted. A pre-approval would not make any difference.")
+
+        return n

ietf/submit/migrations/0001_initial.py

@@ -1,20 +1,17 @@
-import re
+import re, datetime
 
 from django.conf import settings
 from django.db import models
 from django.utils.hashcompat import md5_constructor
 
 from ietf.idtracker.models import IETFWG
+from ietf.person.models import Person
 
 
 class IdSubmissionStatus(models.Model):
     status_id = models.IntegerField(primary_key=True)
     status_value = models.CharField(blank=True, max_length=255)
 
-    class Meta:
-        if not settings.USE_DB_REDESIGN_PROXY_CLASSES:
-            db_table = 'id_submission_status'
-
     def __unicode__(self):
         return self.status_value
 
@@ -50,9 +47,8 @@ class IdSubmissionDetail(models.Model):
     idnits_failed = models.IntegerField(null=True, blank=True)
     submission_hash = models.CharField(null=True, blank=True, max_length=255)
 
-    class Meta:
-        if not settings.USE_DB_REDESIGN_PROXY_CLASSES:
-            db_table = 'id_submission_detail'
+    def __unicode__(self):
+        return u"%s-%s" % (self.filename, self.revision)
 
     def create_hash(self):
         self.submission_hash = md5_constructor(settings.SECRET_KEY + self.filename).hexdigest()
@@ -78,20 +74,14 @@ def create_submission_hash(sender, instance, **kwargs):
 
 models.signals.pre_save.connect(create_submission_hash, sender=IdSubmissionDetail)
 
-class IdApprovedDetail(models.Model):
-    filename = models.CharField(null=True, blank=True, max_length=255, db_index=True)
-    approved_status = models.IntegerField(null=True, blank=True)
-    approved_person_tag = models.IntegerField(null=True, blank=True)
-    approved_date = models.DateField(null=True, blank=True)
-    recorded_by = models.IntegerField(null=True, blank=True)
-
-    class Meta:
-        if not settings.USE_DB_REDESIGN_PROXY_CLASSES:
-            db_table = 'id_approved_detail'
+class Preapproval(models.Model):
+    """Pre-approved draft submission name."""
+    name = models.CharField(max_length=255, db_index=True)
+    by = models.ForeignKey(Person)
+    time = models.DateTimeField(default=datetime.datetime.now)
 
     def __unicode__(self):
-        return "%s (%s)" % (self.filename, self.approved_status)
-
+        return self.name
 
 class TempIdAuthors(models.Model):
     id_document_tag = models.IntegerField()

ietf/submit/migrations/0002_auto__add_preapproval.py

@@ -17,7 +17,7 @@
 from ietf.person.models import Person, Email
 from ietf.group.models import Group, Role
 from ietf.doc.models import Document, BallotPositionDocEvent
-from ietf.submit.models import IdSubmissionDetail
+from ietf.submit.models import IdSubmissionDetail, Preapproval
 
 class SubmitTestCase(django.test.TestCase):
     fixtures = ['names', 'idsubmissionstatus']
@@ -357,7 +357,79 @@ def test_request_full_url(self):
         self.assertTrue("Full URL for managing submission" in outbox[-1]["Subject"])
         self.assertTrue(name in outbox[-1]["Subject"])
 
+class ApprovalsTestCase(django.test.TestCase):
+    fixtures = ['names', 'idsubmissionstatus']
+
+    def test_approvals(self):
+        make_test_data()
+
+        url = urlreverse('submit_approvals')
+        self.client.login(remote_user="marschairman")
+
+        from ietf.submit.views import POSTED, INITIAL_VERSION_APPROVAL_REQUESTED
+
+        Preapproval.objects.create(name="draft-ietf-mars-foo", by=Person.objects.get(user__username="marschairman"))
+        Preapproval.objects.create(name="draft-ietf-mars-baz", by=Person.objects.get(user__username="marschairman"))
+
+        IdSubmissionDetail.objects.create(filename="draft-ietf-mars-foo",
+                                          group_acronym_id=Group.objects.get(acronym="mars").pk,
+                                          revision="00",
+                                          status_id=POSTED)
+        IdSubmissionDetail.objects.create(filename="draft-ietf-mars-bar",
+                                          group_acronym_id=Group.objects.get(acronym="mars").pk,
+                                          revision="00",
+                                          status_id=INITIAL_VERSION_APPROVAL_REQUESTED)
+
+        # get
+        r = self.client.get(url)
+        self.assertEquals(r.status_code, 200)
+        q = PyQuery(r.content)
+
+        self.assertEquals(len(q('.approvals a:contains("draft-ietf-mars-foo")')), 0)
+        self.assertEquals(len(q('.approvals a:contains("draft-ietf-mars-bar")')), 1)
+        self.assertEquals(len(q('.preapprovals td:contains("draft-ietf-mars-foo")')), 0)
+        self.assertEquals(len(q('.preapprovals td:contains("draft-ietf-mars-baz")')), 1)
+
+    def test_add_preapproval(self):
+        make_test_data()
+
+        url = urlreverse('submit_add_preapproval')
+        login_testing_unauthorized(self, "marschairman", url)
+
+        # get
+        r = self.client.get(url)
+        self.assertEquals(r.status_code, 200)
+        q = PyQuery(r.content)
+        self.assertEquals(len(q('input[type=submit]')), 1)
+
+        # faulty post
+        r = self.client.post(url, dict(name="draft-test-nonexistingwg-something"))
+        self.assertEquals(r.status_code, 200)
+        self.assertTrue("errorlist" in r.content)
+
+        # add
+        name = "draft-ietf-mars-foo"
+        r = self.client.post(url, dict(name=name))
+        self.assertEquals(r.status_code, 302)
+
+        self.assertEquals(len(Preapproval.objects.filter(name=name)), 1)
+
+    def test_cancel_preapproval(self):
+        make_test_data()
+
+        preapproval = Preapproval.objects.create(name="draft-ietf-mars-foo", by=Person.objects.get(user__username="marschairman"))
+
+        url = urlreverse('submit_cancel_preapproval', kwargs=dict(preapproval_id=preapproval.pk))
+        login_testing_unauthorized(self, "marschairman", url)
+
+        # get
+        r = self.client.get(url)
+        self.assertEquals(r.status_code, 200)
+        q = PyQuery(r.content)
+        self.assertEquals(len(q('input[type=submit]')), 1)
+
+        # cancel
+        r = self.client.post(url, dict(action="cancel"))
+        self.assertEquals(r.status_code, 302)
 
-if not settings.USE_DB_REDESIGN_PROXY_CLASSES:
-    # the above tests only work with the new schema
-    del SubmitTestCase 
+        self.assertEquals(len(Preapproval.objects.filter(name=preapproval.name)), 0)

ietf/submit/migrations/0003_copy_idapproveddetail_to_preapproval.py

@@ -14,6 +14,9 @@
     url(r'^status/(?P<submission_id>\d+)/(?P<submission_hash>[a-f\d]+)/$', 'draft_status', name='draft_status_by_hash'),
     url(r'^status/(?P<submission_id>\d+)/(?P<submission_hash>[a-f\d]+)/cancel/$', 'draft_cancel', name='draft_cancel_by_hash'),
     url(r'^status/(?P<submission_id>\d+)/(?P<submission_hash>[a-f\d]+)/edit/$', 'draft_edit', name='draft_edit_by_hash'),
+    url(r'^approvals/$', 'approvals', name='submit_approvals'),
+    url(r'^approvals/addpreapproval/$', 'add_preapproval', name='submit_add_preapproval'),
+    url(r'^approvals/cancelpreapproval/(?P<preapproval_id>[a-f\d]+)/$', 'cancel_preapproval', name='submit_cancel_preapproval'),
 )
 
 urlpatterns += patterns('django.views.generic.simple',

ietf/submit/migrations/0004_auto__del_idapproveddetail.py

@@ -9,9 +9,10 @@
 
 from ietf.idtracker.models import (InternetDraft, PersonOrOrgInfo, IETFWG,
                                    IDAuthor, EmailAddress, IESGLogin, BallotInfo)
-from ietf.submit.models import TempIdAuthors
+from ietf.submit.models import TempIdAuthors, IdSubmissionDetail, Preapproval
 from ietf.utils.mail import send_mail, send_mail_message
 from ietf.utils import unaccent
+from ietf.ietfauth.decorators import has_role
 
 from ietf.doc.models import *
 from ietf.person.models import Person, Alias, Email
@@ -457,6 +458,33 @@ def remove_docs(submission):
         if os.path.exists(source):
             os.unlink(source)
 
+def get_approvable_submissions(user):
+    if not user.is_authenticated():
+        return []
+
+    res = IdSubmissionDetail.objects.filter(status=INITIAL_VERSION_APPROVAL_REQUESTED).order_by('-submission_date')
+    if has_role(user, "Secretariat"):
+        return res
+
+    # those we can reach as chairs
+    return res.filter(group_acronym__role__name="chair", group_acronym__role__person__user=user)
+
+def get_preapprovals(user):
+    if not user.is_authenticated():
+        return []
+
+    posted = IdSubmissionDetail.objects.distinct().filter(status__in=[POSTED, POSTED_BY_SECRETARIAT]).values_list('filename', flat=True)
+    res = Preapproval.objects.exclude(name__in=posted).order_by("-time").select_related('by')
+    if has_role(user, "Secretariat"):
+        return res
+
+    acronyms = [g.acronym for g in Group.objects.filter(role__person__user=user, type="wg")]
+
+    res = res.filter(name__regex="draft-[^-]+-(%s)-.*" % "|".join(acronyms))
+
+    return res
+
+
 
 class DraftValidation(object):