Merged [7748] from rjsparks@nostrum.com: Adjust when publication request button appears for documents in non-ietf streams. Fixes bug ietf-tools#1402.

 - Legacy-Id: 7765
Note: SVN reference [7748] has been migrated to Git commit e9984b9

Author: levkowetz

ietf/doc/tests.py

@@ -351,6 +351,22 @@ def test_state_help(self):
         self.assertEqual(r.status_code, 200)
         self.assertTrue(State.objects.get(type="draft-iesg", slug="lc").name in r.content)
 
+    def test_document_nonietf_pubreq_button(self):
+        doc = make_test_data()
+
+        self.client.login(username='iab-chair', password='iab-chair+password')
+        r = self.client.get(urlreverse("doc_view", kwargs=dict(name=doc.name)))
+        self.assertEqual(r.status_code, 200)
+        q = PyQuery(r.content)
+        self.assertFalse(q('.actions'))
+
+        Document.objects.filter(pk=doc.pk).update(stream='iab')
+        r = self.client.get(urlreverse("doc_view", kwargs=dict(name=doc.name)))
+        self.assertEqual(r.status_code, 200)
+        q = PyQuery(r.content)
+        self.assertTrue('IESG state' in q('.actions').html())
+
+
 class AddCommentTestCase(TestCase):
     def test_add_comment(self):
         draft = make_test_data()

ietf/doc/views_doc.py

@@ -311,10 +311,12 @@ def document_main(request, name, rev=None):
             actions.append((label, urlreverse('conflict_review_start', kwargs=dict(name=doc.name))))
 
         if (doc.get_state_slug() != "expired" and doc.stream_id in ("iab", "ise", "irtf")
-            and can_edit_stream_info and not iesg_state):
+            and can_edit_stream_info):
             label = "Request Publication"
             if not doc.intended_std_level:
                 label += " (note that intended status is not set)"
+            if iesg_state and iesg_state.slug != 'dead':
+                label += " (Warning: the IESG state indicates ongoing IESG processing)"
             actions.append((label, urlreverse('doc_request_publication', kwargs=dict(name=doc.name))))
 
         if doc.get_state_slug() != "expired" and doc.stream_id in ("ietf",):