Merged additional django-port and shim-removal tweaks from olau@iola.dk: branch/iola/djangoport@7167.

 - Legacy-Id: 7168

Author: levkowetz

ietf/__init__.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8-no-bom -*-
 # Copyright The IETF Trust 2007, All Rights Reserved
 
-__version__ = "4.91-dev"
+__version__ = "5.0.0-dev"
 
 __date__    = "$Date$"
 

ietf/doc/expire.py

@@ -10,7 +10,7 @@
 from ietf.doc.models import Document, DocEvent, State, save_document_in_history, IESG_SUBSTATE_TAGS
 from ietf.person.models import Person, Email
 from ietf.meeting.models import Meeting
-from ietf.doc.utils import log_state_changed
+from ietf.doc.utils import add_state_change_event
 
 def expirable_draft(draft):
     """Return whether draft is in an expirable state or not. This is
@@ -122,20 +122,18 @@ def expire_draft(doc):
     # clean up files
     move_draft_files_to_archive(doc, doc.rev)
 
-    # change the state
     system = Person.objects.get(name="(System)")
 
+    # change the state
     save_document_in_history(doc)
     if doc.latest_event(type='started_iesg_process'):
-        dead_state = State.objects.get(used=True, type="draft-iesg", slug="dead")
-        prev_state = doc.friendly_state()
-        prev_tag = doc.tags.filter(slug__in=IESG_SUBSTATE_TAGS)
-        prev_tag = prev_tag[0] if prev_tag else None
-        if doc.get_state("draft-iesg") != dead_state:
-            doc.set_state(dead_state)
-            if prev_tag:
-                doc.tags.remove(prev_tag)
-            log_state_changed(None, doc, system, doc.friendly_state(), prev_state)
+        new_state = State.objects.get(used=True, type="draft-iesg", slug="dead")
+        prev_state = doc.get_state(new_state.type_id)
+        prev_tags = doc.tags.filter(slug__in=IESG_SUBSTATE_TAGS)
+        if new_state != prev_state:
+            doc.set_state(new_state)
+            doc.tags.remove(*prev_tags)
+            e = add_state_change_event(doc, system, prev_state, new_state, prev_tags=prev_tags, new_tags=[])
 
         e = DocEvent(doc=doc, by=system)
         e.type = "expired_document"

ietf/doc/lastcall.py

@@ -6,7 +6,7 @@
 
 from ietf.doc.models import *
 from ietf.person.models import Person
-from ietf.doc.utils import log_state_changed
+from ietf.doc.utils import add_state_change_event
 from ietf.doc.mails import *
 
 def request_last_call(request, doc):
@@ -36,30 +36,27 @@ def get_expired_last_calls():
 
 def expire_last_call(doc):
     if doc.type_id == 'draft':
-        state = State.objects.get(used=True, type="draft-iesg", slug="writeupw")
+        new_state = State.objects.get(used=True, type="draft-iesg", slug="writeupw")
         e = doc.latest_event(WriteupDocEvent, type="changed_ballot_writeup_text")
         if e and "Relevant content can frequently be found in the abstract" not in e.text:
             # if boiler-plate text has been removed, we assume the
             # write-up has been written
-            state = State.objects.get(used=True, type="draft-iesg", slug="goaheadw")
-        prev = doc.get_state("draft-iesg")
+            new_state = State.objects.get(used=True, type="draft-iesg", slug="goaheadw")
     elif doc.type_id == 'statchg':
-        state = State.objects.get(used=True, type="statchg", slug="goahead")
-        prev = doc.get_state("statchg")
+        new_state = State.objects.get(used=True, type="statchg", slug="goahead")
     else:
         raise ValueError("Unexpected document type to expire_last_call(): %s" % doc.type)
 
-    prev_state = doc.friendly_state()
-
     save_document_in_history(doc)
-    doc.set_state(state)
 
-    prev_tag = doc.tags.filter(slug__in=IESG_SUBSTATE_TAGS)
-    prev_tag = prev_tag[0] if prev_tag else None
-    if prev_tag:
-        doc.tags.remove(prev_tag)
+    prev_state = doc.get_state(new_state.type_id)
+    doc.set_state(new_state)
+
+    prev_tags = doc.tags.filter(slug__in=IESG_SUBSTATE_TAGS)
+    doc.tags.remove(*prev_tags)
 
-    e = log_state_changed(None, doc, Person.objects.get(name="(System)"), doc.friendly_state(), prev_state)
+    system = Person.objects.get(name="(System)")
+    e = add_state_change_event(doc, system, prev_state, new_state, prev_tags=prev_tags, new_tags=[])
 
     doc.time = e.time
     doc.save()

ietf/doc/migrations/0017_set_type_to_changed_state.py

@@ -426,7 +426,7 @@ def friendly_state(self):
                 # Expired/Withdrawn by Submitter/IETF
                 return state.name
         else:
-           return state.name
+            return state.name
 
     def ipr(self):
         """Returns the IPR disclosures against this document (as a queryset over IprDocAlias)."""

ietf/doc/models.py

@@ -143,44 +143,38 @@ def state_age_colored(doc):
         if not doc.get_state_slug() in ["active", "rfc"]:
             # Don't show anything for expired/withdrawn/replaced drafts
             return ""
-        main_state = doc.get_state_slug('draft-iesg')
-        if not main_state:
+        iesg_state = doc.get_state_slug('draft-iesg')
+        if not iesg_state:
             return ""
 
-        if main_state in ["dead", "watching", "pub"]:
+        if iesg_state in ["dead", "watching", "pub"]:
             return ""
         try:
             state_date = doc.docevent_set.filter(
-                              Q(desc__istartswith="Draft Added by ")|
-                              Q(desc__istartswith="Draft Added in state ")|
-                              Q(desc__istartswith="Draft added in state ")|
-                              Q(desc__istartswith="State changed to ")|
-                              Q(desc__istartswith="State Changes to ")|
-                              Q(desc__istartswith="Sub state has been changed to ")|
-                              Q(desc__istartswith="State has been changed to ")|
-                              Q(desc__istartswith="IESG process started in state")
-                          ).order_by('-time')[0].time.date() 
+                              Q(type="started_iesg_process")|
+                              Q(type="changed_state", statedocevent__state_type="draft-iesg")
+            ).order_by('-time')[0].time.date()
         except IndexError:
             state_date = datetime.date(1990,1,1)
         days = (datetime.date.today() - state_date).days
         # loosely based on 
         # http://trac.tools.ietf.org/group/iesg/trac/wiki/PublishPath
-        if main_state == "lc":
+        if iesg_state == "lc":
             goal1 = 30
             goal2 = 30
-        elif main_state == "rfcqueue":
+        elif iesg_state == "rfcqueue":
             goal1 = 60
             goal2 = 120
-        elif main_state in ["lc-req", "ann"]:
+        elif iesg_state in ["lc-req", "ann"]:
             goal1 = 4
             goal2 = 7
         elif 'need-rev' in [x.slug for x in doc.tags.all()]:
             goal1 = 14
             goal2 = 28
-        elif main_state == "pub-req":
+        elif iesg_state == "pub-req":
             goal1 = 7
             goal2 = 14
-        elif main_state == "ad-eval":
+        elif iesg_state == "ad-eval":
             goal1 = 14
             goal2 = 28
         else:

ietf/doc/templatetags/ballot_icon.py

@@ -30,6 +30,29 @@ def setUp(self):
     def tearDown(self):
         shutil.rmtree(self.charter_dir)
 
+    def test_startstop_process(self):
+        make_test_data()
+
+        group = Group.objects.get(acronym="mars")
+        charter = group.charter
+
+        for option in ("recharter", "abandon"):
+            self.client.logout()
+            url = urlreverse('charter_startstop_process', kwargs=dict(name=charter.name, option=option))
+            login_testing_unauthorized(self, "secretary", url)
+
+            # normal get
+            r = self.client.get(url)
+            self.assertEqual(r.status_code, 200)
+
+            # post
+            r = self.client.post(url, dict(message="test message"))
+            self.assertEqual(r.status_code, 302)
+            if option == "abandon":
+                self.assertTrue("abandoned" in charter.latest_event(type="changed_document").desc.lower())
+            else:
+                self.assertTrue("state changed" in charter.latest_event(type="changed_state").desc.lower())
+
     def test_change_state(self):
         make_test_data()
 
@@ -71,7 +94,7 @@ def test_change_state(self):
             def find_event(t):
                 return [e for e in charter.docevent_set.all()[:events_now - events_before] if e.type == t]
 
-            self.assertTrue("state changed" in find_event("changed_document")[0].desc.lower())
+            self.assertTrue("state changed" in find_event("changed_state")[0].desc.lower())
 
             if slug in ("intrev", "iesgrev"):
                 self.assertTrue(find_event("created_ballot"))
@@ -88,6 +111,10 @@ def test_edit_telechat_date(self):
         url = urlreverse('charter_telechat_date', kwargs=dict(name=charter.name))
         login_testing_unauthorized(self, "secretary", url)
 
+        # get
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+
         # add to telechat
         self.assertTrue(not charter.latest_event(TelechatDocEvent, "scheduled_for_telechat"))
         telechat_date = TelechatDate.objects.active()[0].date
@@ -122,6 +149,10 @@ def test_edit_notify(self):
         url = urlreverse('charter_edit_notify', kwargs=dict(name=charter.name))
         login_testing_unauthorized(self, "secretary", url)
 
+        # get
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+
         # post
         self.assertTrue(not charter.notify)
         r = self.client.post(url, dict(notify="someone@example.com, someoneelse@example.com"))
@@ -195,15 +226,82 @@ def test_submit_charter(self):
             self.assertEqual(f.read(),
                               "Windows line\nMac line\nUnix line\n" + utf_8_snippet)
 
-class ApproveCharterTests(TestCase):
-    def setUp(self):
-        self.charter_dir = os.path.abspath("tmp-charter-dir")
-        os.mkdir(self.charter_dir)
-        settings.CHARTER_PATH = self.charter_dir
+    def test_edit_announcement_text(self):
+        draft = make_test_data()
+        charter = draft.group.charter
+
+        for ann in ("action", "review"):
+            url = urlreverse('ietf.doc.views_charter.announcement_text', kwargs=dict(name=charter.name, ann=ann))
+            self.client.logout()
+            login_testing_unauthorized(self, "secretary", url)
+
+            # normal get
+            r = self.client.get(url)
+            self.assertEqual(r.status_code, 200)
+            q = PyQuery(r.content)
+            self.assertEqual(len(q('textarea[name=announcement_text]')), 1)
+            # as Secretariat, we can send
+            if ann == "review":
+                mailbox_before = len(outbox)
+                by = Person.objects.get(user__username="secretary")
+                r = self.client.post(url, dict(
+                    announcement_text=default_review_text(draft.group, charter, by).text,
+                    send_text="1"))
+                self.assertEqual(len(outbox), mailbox_before + 1)
+
+            # save
+            r = self.client.post(url, dict(
+                    announcement_text="This is a simple test.",
+                    save_text="1"))
+            self.assertEqual(r.status_code, 302)
+            self.assertTrue("This is a simple test" in charter.latest_event(WriteupDocEvent, type="changed_%s_announcement" % ann).text)
 
-    def tearDown(self):
-        shutil.rmtree(self.charter_dir)
+            # test regenerate
+            r = self.client.post(url, dict(
+                    announcement_text="This is a simple test.",
+                    regenerate_text="1"))
+            self.assertEqual(r.status_code, 200)
+            q = PyQuery(r.content)
+            self.assertTrue(draft.group.name in charter.latest_event(WriteupDocEvent, type="changed_%s_announcement" % ann).text)
+
+    def test_edit_ballot_writeupnotes(self):
+        draft = make_test_data()
+        charter = draft.group.charter
+        by = Person.objects.get(user__username="secretary")
+
+        BallotDocEvent.objects.create(
+            type="created_ballot",
+            ballot_type=BallotType.objects.get(doc_type="charter", slug="approve"),
+            by=by,
+            doc=charter,
+            desc="Created ballot",
+            )
+
+        url = urlreverse('ietf.doc.views_charter.ballot_writeupnotes', kwargs=dict(name=charter.name))
+        login_testing_unauthorized(self, "secretary", url)
+
+        default_action_text(draft.group, charter, by)
+
+        # normal get
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        q = PyQuery(r.content)
+        self.assertEqual(len(q('textarea[name=ballot_writeup]')), 1)
+
+        # save
+        r = self.client.post(url, dict(
+            ballot_writeup="This is a simple test.",
+            save_ballot_writeup="1"))
+        self.assertEqual(r.status_code, 200)
+        self.assertTrue("This is a simple test" in charter.latest_event(WriteupDocEvent, type="changed_ballot_writeup_text").text)
 
+        # send
+        mailbox_before = len(outbox)
+        r = self.client.post(url, dict(
+            ballot_writeup="This is a simple test.",
+            send_ballot="1"))
+        self.assertEqual(len(outbox), mailbox_before + 1)
+        
     def test_approve(self):
         make_test_data()
 
@@ -278,3 +376,23 @@ def test_approve(self):
         self.assertEqual(group.groupmilestone_set.filter(state="active").count(), 2)
         self.assertEqual(group.groupmilestone_set.filter(state="active", desc=m1.desc).count(), 1)
         self.assertEqual(group.groupmilestone_set.filter(state="active", desc=m4.desc).count(), 1)
+
+    def test_charter_with_milestones(self):
+        draft = make_test_data()
+        charter = draft.group.charter
+
+        NewRevisionDocEvent.objects.create(doc=charter,
+                                           type="new_revision",
+                                           rev=charter.rev,
+                                           by=Person.objects.get(name="(System)"))
+
+        m = GroupMilestone.objects.create(group=draft.group,
+                                          state_id="active",
+                                          desc="Test milestone",
+                                          due=datetime.date.today(),
+                                          resolved="")
+
+        url = urlreverse('charter_with_milestones_txt', kwargs=dict(name=charter.name, rev=charter.rev))
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        self.assertTrue(m.desc in r.content)

ietf/doc/tests_charter.py

@@ -67,7 +67,7 @@ def test_change_state(self):
         self.assertTrue(draft.tags.filter(slug="point"))
         self.assertEqual(draft.docevent_set.count(), events_before + 2)
         self.assertTrue("Test comment" in draft.docevent_set.all()[0].desc)
-        self.assertTrue("State changed" in draft.docevent_set.all()[1].desc)
+        self.assertTrue("IESG state changed" in draft.docevent_set.all()[1].desc)
         self.assertEqual(len(outbox), mailbox_before + 2)
         self.assertTrue("State Update Notice" in outbox[-2]['Subject'])
         self.assertTrue(draft.name in outbox[-1]['Subject'])
@@ -232,6 +232,10 @@ def test_edit_telechat_date(self):
                     note="",
                     )
 
+        # get
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+
         # add to telechat
         self.assertTrue(not draft.latest_event(TelechatDocEvent, type="scheduled_for_telechat"))
         data["telechat_date"] = TelechatDate.objects.active()[0].date.isoformat()
@@ -347,6 +351,11 @@ def test_edit_consensus(self):
         url = urlreverse('doc_edit_consensus', kwargs=dict(name=draft.name))
         login_testing_unauthorized(self, "secretary", url)
 
+        # get
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+
+        # post
         self.assertTrue(not draft.latest_event(ConsensusDocEvent, type="changed_consensus"))
         r = self.client.post(url, dict(consensus="Yes"))
         self.assertEqual(r.status_code, 302)

ietf/doc/tests_draft.py

@@ -11,7 +11,6 @@
     url(r'^(?P<ann>action|review)/$', "ietf.doc.views_charter.announcement_text", name="charter_edit_announcement"),
     url(r'^ballotwriteupnotes/$', "ietf.doc.views_charter.ballot_writeupnotes"),
     url(r'^approve/$', "ietf.doc.views_charter.approve", name='charter_approve'),
-    url(r'^submit/$', "ietf.doc.views_charter.submit", name='charter_submit'),
-    url(r'^submit/(?P<option>initcharter|recharter)/$', "ietf.doc.views_charter.submit", name='charter_submit'), # shouldn't be here
+    url(r'^submit/(?:(?P<option>initcharter|recharter)/)?$', "ietf.doc.views_charter.submit", name='charter_submit'),
     url(r'^withmilestones-(?P<rev>[0-9-]+).txt$', "ietf.doc.views_charter.charter_with_milestones_txt", name='charter_with_milestones_txt'),
 )