Extend edit_info view to handle adding an IDInternal, refactor a bit to cut down on boiler-plate code in the state diff

 - Legacy-Id: 2289

Author: OleLaursen

branch/iesg-tracker/ietf/idrfc/fixtures/draft.xml

@@ -184,4 +184,81 @@ provided.</field>
         <field to="idtracker.iesglogin" name="resurrect_requested_by" rel="ManyToOneRel"><None></None></field>
         <field type="IntegerField" name="approved_in_minute">1</field>
     </object>
+    <object pk="19892" model="idtracker.internetdraft">
+        <field type="CharField" name="title">Uniform Resource Name (URN) Syntax</field>
+        <field type="CharField" name="id_document_key">UNIFORM RESOURCE NAME (URN) SYNTAX</field>
+        <field to="idtracker.acronym" name="group" rel="ManyToOneRel">1027</field>
+        <field type="CharField" name="filename">draft-ah-rfc2141bis-urn</field>
+        <field type="CharField" name="revision">00</field>
+        <field type="DateField" name="revision_date">2010-03-25</field>
+        <field type="CharField" name="file_type">.txt</field>
+        <field type="IntegerField" name="txt_page_count">18</field>
+        <field type="CharField" name="local_path"><None></None></field>
+        <field type="DateField" name="start_date">2010-03-25</field>
+        <field type="DateField" name="expiration_date"><None></None></field>
+        <field type="TextField" name="abstract">Uniform Resource Names (URNs) are intended to serve as persistent,
+location-independent, resource identifiers.  This document serves as
+the foundation of the 'urn' URI Scheme according to RFC 3986 and sets
+forward the canonical syntax for URNs, which subdivides URNs into
+"namespaces".  A discussion of both existing legacy and new
+namespaces and requirements for URN presentation and transmission are
+presented.  Finally, there is a discussion of URN equivalence and how
+to determine it.  This document supersedes RFC 2141.
+
+The requirements and procedures for URN Namespace registration
+documents are currently set forth in RFC 3406, which is also expected
+to be updated by an independent, revised specification soon.
+
+Discussion
+
+This draft version has been obtained by importing the text from RFC
+2141 into modern tools and making a first round of updating steps.
+It is intended to serve as one of the starting points for an effort
+to bring URN RFCs in alignment with STD 63, STD 68, BCP 26, and the
+requirements from emerging distributed national and international URN
+resolution systems, and advance them on the IETF Standards Track.
+
+Until a more specific mailing list is established, comments are
+welcome on the uri-review@ietf.org mailing list (or sent to the
+document editor).</field>
+        <field type="DateField" name="dunn_sent_date"><None></None></field>
+        <field type="DateField" name="extension_date"><None></None></field>
+        <field to="idtracker.idstatus" name="status" rel="ManyToOneRel">1</field>
+        <field to="idtracker.idintendedstatus" name="intended_status" rel="ManyToOneRel">8</field>
+        <field type="DateField" name="lc_sent_date"><None></None></field>
+        <field type="CharField" name="lc_changes"><None></None></field>
+        <field type="DateField" name="lc_expiration_date"><None></None></field>
+        <field type="DateField" name="b_sent_date"><None></None></field>
+        <field type="DateField" name="b_discussion_date"><None></None></field>
+        <field type="DateField" name="b_approve_date"><None></None></field>
+        <field type="DateField" name="wgreturn_date"><None></None></field>
+        <field type="IntegerField" name="rfc_number"><None></None></field>
+        <field type="TextField" name="comments"><None></None></field>
+        <field type="DateField" name="last_modified_date">2010-03-25</field>
+        <field to="idtracker.internetdraft" name="replaced_by" rel="ManyToOneRel"><None></None></field>
+        <field type="BooleanField" name="review_by_rfc_editor">0</field>
+        <field type="BooleanField" name="expired_tombstone">0</field>
+    </object>
+    <object pk="1027" model="idtracker.acronym">
+        <field type="CharField" name="acronym">none</field>
+        <field type="CharField" name="name">Individual Submissions</field>
+        <field type="CharField" name="name_key">INDIVIDUAL SUBMISSIONS</field>
+    </object>
+    <object pk="1027" model="idtracker.ietfwg">
+        <field to="idtracker.wgtype" name="group_type" rel="ManyToOneRel">4</field>
+        <field type="DateField" name="proposed_date"><None></None></field>
+        <field type="DateField" name="start_date"><None></None></field>
+        <field type="DateField" name="dormant_date"><None></None></field>
+        <field type="DateField" name="concluded_date"><None></None></field>
+        <field to="idtracker.wgstatus" name="status" rel="ManyToOneRel">1</field>
+        <field to="idtracker.areadirector" name="area_director" rel="ManyToOneRel">112</field>
+        <field type="CharField" name="meeting_scheduled">NO</field>
+        <field type="CharField" name="email_address"></field>
+        <field type="CharField" name="email_subscribe"></field>
+        <field type="CharField" name="email_keyword"></field>
+        <field type="CharField" name="email_archive"></field>
+        <field type="TextField" name="comments">This is here so that 'none' can be entered in, for example, idform.</field>
+        <field type="DateField" name="last_modified_date">2002-06-24</field>
+        <field type="CharField" name="meeting_scheduled_old">NO</field>
+    </object>
 </django-objects>

branch/iesg-tracker/ietf/idrfc/generate_fixtures.py

@@ -59,6 +59,8 @@ def output(name, qs):
 draftdata.extend([a.area.area_acronym for a in ags])
 d = InternetDraft.objects.get(filename="draft-ietf-mip6-cn-ipsec")
 draftdata.extend([d, d.idinternal])
+d = InternetDraft.objects.get(filename="draft-ah-rfc2141bis-urn")
+draftdata.extend([d, d.group, d.group.ietfwg])
 output("draft", draftdata)
 
 # specific ballot info

branch/iesg-tracker/ietf/idrfc/tests.py

@@ -164,12 +164,12 @@ def test_edit_info(self):
         draft.group = Acronym.objects.get(acronym_id=Acronym.INDIVIDUAL_SUBMITTER)
         draft.save()
         new_job_owner = IESGLogin.objects.exclude(id__in=[IESGLogin.objects.get(login_name="klm").id, draft.idinternal.job_owner_id])[0]
-        new_group = Acronym.objects.filter(area__status=Area.ACTIVE)[0]
+        new_area = Area.active_areas()[0]
 
         r = self.client.post(url,
                              dict(intended_status=str(draft.intended_status_id),
                                   status_date=str(date.today() + timedelta(2)),
-                                  group=str(new_group.acronym_id),
+                                  area_acronym=str(new_area.area_acronym_id),
                                   via_rfc_editor="1",
                                   job_owner=new_job_owner.id,
                                   state_change_notice_to="test@example.com",
@@ -179,7 +179,7 @@ def test_edit_info(self):
         self.assertEquals(r.status_code, 302)
 
         draft = InternetDraft.objects.get(filename="draft-ietf-mipshop-pfmipv6")
-        self.assertEquals(draft.group, new_group)
+        self.assertEquals(draft.idinternal.area_acronym, new_area)
         self.assertTrue(draft.idinternal.via_rfc_editor)
         self.assertEquals(draft.idinternal.job_owner, new_job_owner)
         self.assertEquals(draft.idinternal.note, "")
@@ -188,6 +188,47 @@ def test_edit_info(self):
         self.assertEquals(len(mail_outbox), mailbox_before + 1)
         self.assertTrue(draft.filename in mail_outbox[-1]['Subject'])
 
+    def test_add_draft(self):
+        draft = InternetDraft.objects.get(filename="draft-ah-rfc2141bis-urn")
+        url = urlreverse('doc_edit_info', kwargs=dict(name=draft.filename))
+        login_testing_unauthorized(self, "klm", url)
+
+        # normal get
+        r = self.client.get(url)
+        self.assertEquals(r.status_code, 200)
+        q = PyQuery(r.content)
+        self.assertEquals(len(q('form select[name=intended_status]')), 1)
+        self.assertEquals(len(q('form input[name=via_rfc_editor]')), 1)
+        self.assertTrue('@' in q('form input[name=state_change_notice_to]')[0].get('value'))
+
+        # add
+        mailbox_before = len(mail_outbox)
+
+        job_owner = IESGLogin.objects.filter(user_level=1)[0]
+        area = Area.active_areas()[0]
+
+        r = self.client.post(url,
+                             dict(intended_status=str(draft.intended_status_id),
+                                  status_date=str(date.today() + timedelta(2)),
+                                  area_acronym=str(area.area_acronym_id),
+                                  via_rfc_editor="1",
+                                  job_owner=job_owner.id,
+                                  state_change_notice_to="test@example.com",
+                                  note="This is a note",
+                                  telechat_date="",
+                                  ))
+        self.assertEquals(r.status_code, 302)
+
+        draft = InternetDraft.objects.get(filename="draft-ah-rfc2141bis-urn")
+        self.assertEquals(draft.idinternal.area_acronym, area)
+        self.assertTrue(draft.idinternal.via_rfc_editor)
+        self.assertEquals(draft.idinternal.job_owner, job_owner)
+        self.assertEquals(draft.idinternal.note, "This is a note")
+        self.assertTrue(not draft.idinternal.agenda)
+        self.assertEquals(draft.idinternal.comments().count(), 3)
+        self.assertTrue("Draft added" in draft.idinternal.comments()[0].comment_text)
+        self.assertEquals(len(mail_outbox), mailbox_before)
+
 
 class RequestResurrectTestCase(django.test.TestCase):
     fixtures = ['base', 'draft']

branch/iesg-tracker/ietf/idrfc/utils.py

@@ -28,7 +28,7 @@ def generate_ballot(request, doc):
     doc.idinternal.ballot = ballot
     return ballot
 
-def make_last_call(request, doc):
+def request_last_call(request, doc):
     try:
         ballot = doc.idinternal.ballot
     except BallotInfo.DoesNotExist:

branch/iesg-tracker/ietf/idrfc/views_ballot.py

@@ -326,7 +326,7 @@ def prepare_last_call(request, name):
 
                     change = log_state_changed(request, doc, login)
                     email_owner(request, doc, doc.idinternal.job_owner, login, change)
-                    make_last_call(request, doc)
+                    requiest_last_call(request, doc)
 
                     return render_to_response('idrfc/last_call_requested.html',
                                               dict(doc=doc),