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
This commit is contained in:
Ole Laursen 2013-01-17 16:02:50 +00:00
parent b8724d84f4
commit 188c619635
3 changed files with 12 additions and 3 deletions

View file

@ -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

View file

@ -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,

View file

@ -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: