From 188c619635d36eb8362d8b529d004a2575df0309 Mon Sep 17 00:00:00 2001
From: Ole Laursen <olau@iola.dk>
Date: Thu, 17 Jan 2013 16:02:50 +0000
Subject: [PATCH] Display draft-iesg state rather than doc.friendly_state as
 IESG state,

also show a notice that the IESG state refers to post-RFC processing
if it does, like the old separate RFC page did
 - Legacy-Id: 5288
---
 ietf/doc/models.py                       | 6 ++++--
 ietf/idrfc/views_doc.py                  | 1 +
 ietf/templates/idrfc/document_draft.html | 8 +++++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/ietf/doc/models.py b/ietf/doc/models.py
index 3335400b9..5e43d06d6 100644
--- a/ietf/doc/models.py
+++ b/ietf/doc/models.py
@@ -138,8 +138,10 @@ class DocumentInfo(models.Model):
     def active_ballot(self):
         """Returns the most recently created ballot if it isn't closed."""
         ballot = self.latest_event(BallotDocEvent, type="created_ballot")
-        open = self.ballot_open(ballot.ballot_type.slug) if ballot else False
-        return ballot if open else None
+        if ballot and self.ballot_open(ballot.ballot_type.slug):
+            return ballot
+        else:
+            return None
 
     class Meta:
         abstract = True
diff --git a/ietf/idrfc/views_doc.py b/ietf/idrfc/views_doc.py
index fd79d800c..60b6feedd 100644
--- a/ietf/idrfc/views_doc.py
+++ b/ietf/idrfc/views_doc.py
@@ -350,6 +350,7 @@ def document_main(request, name, rev=None):
                                        rfc_editor_state=doc.get_state("draft-rfceditor"),
                                        iana_review_state=doc.get_state("draft-iana-review"),
                                        iana_action_state=doc.get_state("draft-iana-action"),
+                                       started_iesg_process=doc.latest_event(type="started_iesg_process"),
                                        shepherd_writeup=shepherd_writeup,
                                        search_archive=search_archive,
                                        actions=actions,
diff --git a/ietf/templates/idrfc/document_draft.html b/ietf/templates/idrfc/document_draft.html
index b33f964da..8405843f6 100644
--- a/ietf/templates/idrfc/document_draft.html
+++ b/ietf/templates/idrfc/document_draft.html
@@ -143,11 +143,17 @@
 
     <tr><td colspan='2'><hr size='1' noshade /></td></tr>
 
+    {% if published and started_iesg_process and published.time < started_iesg_process.time %}
+    <tr>
+      <td colspan='2' style="font-style:italic">This information refers to IESG processing after the RFC was initially published:</td>
+    </tr>
+    {% endif %}
+
     <tr>
       <td><a href="/idtracker/help/state/">IESG State</a>:</td>
       <td>
         <a {% if iesg_state and can_edit %}class="editlink" href="{% url doc_change_state name=doc.name %}"{% endif %}>
-        {{ doc.friendly_state|safe }}</a>
+        {{ iesg_state|default:"I-D Exists" }}</a>
 
         {% if iana_review_state %}
         <div>IANA Review State: