Merged in [10839] from housley@vigilsec.com:

Added test for proper eneration of the approval message with and without an RFC Editor Note.
 - Legacy-Id: 10901
Note: SVN reference [10839] has been migrated to Git commit b4b14112b8

changelog

@@ -1,3 +1,36 @@
+ietfdb (6.16.0) ietf; urgency=medium
+
+  **Yang validation of draft submissions**
+
+  This release adds Yang validation of submitted drafts which contain
+  Yang code, through a new plug-in architecture which makes it easy to 
+  addo other submission-time checkers and validators in the future.
+
+  It also contains a few unrelated fixes and tweaks, as follows:
+
+  * Fixed pyflakes complaints introduced with pyflakes 1.1.0
+
+  * Refactored draft submission checks so that new checkers can be slotted 
+    in through a configuration in settings.py.  Refactored the calling of 
+    idnits to use the new API, and added a pyang validation check.
+
+  * Added new entries to requirements.txt: pyang, xym, and jsonfield.  Sorted
+    the list.
+
+  * Merged in [10880] from rjsparks@nostrum.com:
+    Only show the 'Upload new revision' button when the view will actually
+    let you upload a new revision.  
+
+  * Merged in [10862] from rjsparks@nostrum.com:
+    Group concluded working groups by area. Fixes #1670.  
+
+  * Merged in [10839] from housley@vigilsec.com:
+    Added test for proper eneration of the approval message with and without
+    an RFC Editor Note.  Tweaked RFC Editor note display template.
+
+ -- Henrik Levkowetz <henrik@levkowetz.com>  05 Mar 2016 06:27:10 -0800
+
+
 ietfdb (6.15.0) ietf; urgency=medium
 
   **Session docs, WG List Archive Tab, RFC Note enhancements**

ietf/doc/tests_ballot.py

@@ -478,6 +478,21 @@ class ApproveBallotTests(TestCase):
         q = PyQuery(r.content)
         self.assertTrue(q('[type=submit]:contains("send announcement")'))
         self.assertEqual(len(q('form pre:contains("Subject: Protocol Action")')), 1)
+        self.assertEqual(len(q('form pre:contains("This is a note for the RFC Editor")')), 0)
+
+        # add a note to the RFC Editor
+        WriteupDocEvent.objects.create(
+            doc=draft,
+            desc="Changed text",
+            type="changed_rfc_editor_note_text",
+            text="This is a note for the RFC Editor.",
+            by=Person.objects.get(name="(System)"))
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        q = PyQuery(r.content)
+        self.assertTrue(q('[type=submit]:contains("send announcement")'))
+        self.assertEqual(len(q('form pre:contains("Subject: Protocol Action")')), 1)
+        self.assertEqual(len(q('form pre:contains("This is a note for the RFC Editor")')), 1)
 
         # approve
         mailbox_before = len(outbox)

ietf/templates/doc/document_draft.html

@@ -200,7 +200,7 @@
 	  <th>
 	     {% if doc.stream.slug != "legacy" %}
 	     <a href="{% url "ietf.help.views.state" doc=doc.type.slug type=doc.stream.slug %}">
-		{% if doc.stream.slug == "ietf" %} WG {% else %} {{ doc.stream }} {% endif %} state
+		{% if doc.stream_id == 'ietf' %} WG {% else %} {{ doc.stream }} {% endif %} state
 	     </a>
 	     {% else %}
 		Legacy state
@@ -229,7 +229,7 @@
 	{% endif %}
       </tr>
 
-      {% if consensus and not stream_state_type_slug == "draft-stream-ietf" %}
+      {% if consensus and not doc.stream_id == 'ietf' %}
 	<tr>
 	  <th></th>
 	  <th>Consensus</th>
@@ -264,7 +264,7 @@
         </tr>
       {% endif %}
 
-      {% if stream_state_type_slug == "draft-stream-ietf" %}
+      {% if doc.stream_id == 'ietf' %}
 	<tr>
 	  <th></th>
 	  <th>Document shepherd</th>
@@ -326,7 +326,7 @@
 
     </tbody>
 
-    {% if not stream_state_type_slug == "draft-stream-iab" %}
+    {% if not doc.stream_id == 'iab' %}
       <tbody class="meta">
 	<tr>
 	  <th>IESG</th>
@@ -341,7 +341,7 @@
 	  </td>
 	</tr>
 
-        {% if consensus and stream_state_type_slug == "draft-stream-ietf" %}
+        {% if consensus and doc.stream_id == 'ietf' %}
 	  <tr>
 	    <th></th>
 	    <th>Consensus</th>