Merged in [8256] from rjsparks@nostrum.com:\n Allow defer for status change documents. Fixes bug ietf-tools#1397.

 - Legacy-Id: 8367
Note: SVN reference [8256] has been migrated to Git commit 1a29f28

Author: levkowetz

ietf/doc/migrations/0020_change_statchg_statetype_label.py

@@ -390,6 +390,8 @@ def active_defer_event(self):
             return self.latest_event(type="changed_state", desc__icontains="State changed to <b>IESG Evaluation - Defer</b>")
         elif self.type_id == "conflrev" and self.get_state_slug("conflrev") == "defer":
             return self.latest_event(type="changed_state", desc__icontains="State changed to <b>IESG Evaluation - Defer</b>")
+        elif self.type_id == "statchg" and self.get_state_slug("statchg") == "defer":
+            return self.latest_event(type="changed_state", desc__icontains="State changed to <b>IESG Evaluation - Defer</b>")
         return None
 
     def most_recent_ietflc(self):

ietf/doc/models.py

@@ -476,7 +476,7 @@ def helper_test_defer(self,name):
         doc = Document.objects.get(name=name)
         self.assertEqual(doc.telechat_date(), second_date)
         self.assertTrue(doc.returning_item())
-        defer_states = dict(draft=['draft-iesg','defer'],conflrev=['conflrev','defer'])
+        defer_states = dict(draft=['draft-iesg','defer'],conflrev=['conflrev','defer'],statchg=['statchg','defer'])
         if doc.type_id in defer_states:
            self.assertEqual(doc.get_state(defer_states[doc.type_id][0]).slug,defer_states[doc.type_id][1])
         self.assertTrue(doc.active_defer_event())
@@ -511,7 +511,7 @@ def helper_test_undefer(self,name):
                              returning_item = True, 
                             )
         e.save()
-        defer_states = dict(draft=['draft-iesg','defer'],conflrev=['conflrev','defer'])
+        defer_states = dict(draft=['draft-iesg','defer'],conflrev=['conflrev','defer'],statchg=['statchg','defer'])
         if doc.type_id in defer_states:
             doc.set_state(State.objects.get(used=True, type=defer_states[doc.type_id][0],slug=defer_states[doc.type_id][1]))
             doc.save()
@@ -530,7 +530,7 @@ def helper_test_undefer(self,name):
         doc = Document.objects.get(name=name)
         self.assertEqual(doc.telechat_date(), first_date)
         self.assertTrue(doc.returning_item()) 
-        undefer_states = dict(draft=['draft-iesg','iesg-eva'],conflrev=['conflrev','iesgeval'])
+        undefer_states = dict(draft=['draft-iesg','iesg-eva'],conflrev=['conflrev','iesgeval'],statchg=['statchg','iesgeval'])
         if doc.type_id in undefer_states:
            self.assertEqual(doc.get_state(undefer_states[doc.type_id][0]).slug,undefer_states[doc.type_id][1])
         self.assertFalse(doc.active_defer_event())
@@ -551,12 +551,18 @@ def test_defer_draft(self):
     def test_defer_conflict_review(self):
         self.helper_test_defer('conflict-review-imaginary-irtf-submission')
 
+    def test_defer_status_change(self):
+        self.helper_test_defer('status-change-imaginary-mid-review')
+
     def test_undefer_draft(self):
         self.helper_test_undefer('draft-ietf-mars-test')
 
     def test_undefer_conflict_review(self):
         self.helper_test_undefer('conflict-review-imaginary-irtf-submission')
 
+    def test_undefer_status_change(self):
+        self.helper_test_undefer('status-change-imaginary-mid-review')
+
     # when charters support being deferred, be sure to test them here
 
     def setUp(self):

ietf/doc/tests_ballot.py

@@ -54,8 +54,8 @@ def do_undefer_ballot(request, doc):
     if doc.type_id == 'draft':
         new_state = State.objects.get(used=True, type="draft-iesg", slug='iesg-eva')
         prev_tags = doc.tags.filter(slug__in=IESG_SUBSTATE_TAGS)
-    elif doc.type_id == 'conflrev':
-        new_state = State.objects.get(used=True, type='conflrev',slug='iesgeval')
+    elif doc.type_id in ['conflrev','statchg']:
+        new_state = State.objects.get(used=True, type=doc.type_id, slug='iesgeval')
 
     prev_state = doc.get_state(new_state.type_id if new_state else None)
 
@@ -334,9 +334,9 @@ def clear_ballot(request, name):
 def defer_ballot(request, name):
     """Signal post-pone of ballot, notifying relevant parties."""
     doc = get_object_or_404(Document, docalias__name=name)
-    if doc.type_id not in ('draft','conflrev'):
+    if doc.type_id not in ('draft','conflrev','statchg'):
         raise Http404()
-    interesting_state = dict(draft='draft-iesg',conflrev='conflrev')
+    interesting_state = dict(draft='draft-iesg',conflrev='conflrev',statchg='statchg')
     state = doc.get_state(interesting_state[doc.type_id])
     if not state or state.slug=='defer' or not doc.telechat_date():
         raise Http404()
@@ -353,8 +353,8 @@ def defer_ballot(request, name):
         if doc.type_id == 'draft':
             new_state = State.objects.get(used=True, type="draft-iesg", slug='defer')
             prev_tags = doc.tags.filter(slug__in=IESG_SUBSTATE_TAGS)
-        elif doc.type_id == 'conflrev':
-            new_state = State.objects.get(used=True, type='conflrev', slug='defer')
+        elif doc.type_id in ['conflrev','statchg']:
+            new_state = State.objects.get(used=True, type=doc.type_id, slug='defer')
 
         prev_state = doc.get_state(new_state.type_id if new_state else None)
 
@@ -383,11 +383,11 @@ def defer_ballot(request, name):
 def undefer_ballot(request, name):
     """undo deferral of ballot ballot."""
     doc = get_object_or_404(Document, docalias__name=name)
-    if doc.type_id not in ('draft','conflrev'):
+    if doc.type_id not in ('draft','conflrev','statchg'):
         raise Http404()
     if doc.type_id == 'draft' and not doc.get_state("draft-iesg"):
         raise Http404()
-    interesting_state = dict(draft='draft-iesg',conflrev='conflrev')
+    interesting_state = dict(draft='draft-iesg',conflrev='conflrev',statchg='statchg')
     state = doc.get_state(interesting_state[doc.type_id]) 
     if not state or state.slug!='defer':
         raise Http404()