From feec6899be0b1543df3da93a53286e00aef3b985 Mon Sep 17 00:00:00 2001 From: Ryan Cross Date: Tue, 2 Sep 2014 22:56:05 +0000 Subject: [PATCH] changes to support consensus status. Commit ready for merge - Legacy-Id: 8301 --- ietf/doc/templatetags/ietf_filters.py | 14 ++++++++++++++ ietf/secr/templates/telechat/doc.html | 2 ++ ietf/templates/iesg/moderator_doc.html | 1 + 3 files changed, 17 insertions(+) diff --git a/ietf/doc/templatetags/ietf_filters.py b/ietf/doc/templatetags/ietf_filters.py index 2d03d55f4..75329966c 100644 --- a/ietf/doc/templatetags/ietf_filters.py +++ b/ietf/doc/templatetags/ietf_filters.py @@ -6,6 +6,7 @@ import datetime import types from email.utils import parseaddr +from ietf.doc.models import ConsensusDocEvent from django import template from django.utils.html import escape, fix_ampersands from django.template.defaultfilters import truncatewords_html, linebreaksbr, stringfilter, urlize @@ -498,3 +499,16 @@ def plural(text, seq, arg=u's'): def ics_esc(text): text = re.sub(r"([\n,;\\])", r"\\\1", text) return text + +@register.filter +def consensus(doc): + """Returns document consensus Yes/No/Unknown.""" + event = doc.latest_event(ConsensusDocEvent,type="changed_consensus") + if event: + if event.consensus: + return "Yes" + else: + return "No" + else: + return "Unknown" + diff --git a/ietf/secr/templates/telechat/doc.html b/ietf/secr/templates/telechat/doc.html index 01efac33f..89aac3cdf 100644 --- a/ietf/secr/templates/telechat/doc.html +++ b/ietf/secr/templates/telechat/doc.html @@ -1,4 +1,5 @@ {% extends "telechat/base_telechat.html" %} +{% load ietf_filters %} {% block breadcrumbs %}{{ block.super }} » {{ date }} @@ -20,6 +21,7 @@ {% if conflictdoc %}References: {{ conflictdoc }}
{% endif %} Ballot Writeup
Token: {{ document.ad.name }}
+ {% if document.type_id == "draft" %}Consensus: {{ document|consensus }}
{% endif %} Number of Open Positions: {{ open_positions }}

diff --git a/ietf/templates/iesg/moderator_doc.html b/ietf/templates/iesg/moderator_doc.html index fdd4a0a3b..ae8811bbf 100644 --- a/ietf/templates/iesg/moderator_doc.html +++ b/ietf/templates/iesg/moderator_doc.html @@ -41,6 +41,7 @@ Some parts Copyright (c) 2009 The IETF Trust, all rights reserved. ({{ doc.title }})
Intended status: {{ doc.intended_std_level }}
+ Consensus: {{ doc|consensus }}
Token: {{ doc.ad.plain_name }}
{% if doc.type_id == "draft" %} Last call ends: {{ doc.most_recent_ietflc.expires.date|default:"(none)" }}