From fc0c605f5bbe5514e2a5abe5fc12cc46e179169d Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Wed, 16 Apr 2014 19:02:25 +0000 Subject: [PATCH] Merged [7590] from rjsparks@nostrum.com: Change when the consensus field is displayed and who can edit it for IETF stream documents. Fixes bug #1380. - Legacy-Id: 7612 Note: SVN reference [7590] has been migrated to Git commit 85458abee3a1474ba9fc476c087e08e24a62cb2e --- ietf/doc/views_doc.py | 12 +++++++++++- ietf/templates/doc/document_draft.html | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ietf/doc/views_doc.py b/ietf/doc/views_doc.py index c96f9abb5..1eab69fbd 100644 --- a/ietf/doc/views_doc.py +++ b/ietf/doc/views_doc.py @@ -262,9 +262,18 @@ def document_main(request, name, rev=None): can_edit_stream_info = is_authorized_in_doc_stream(request.user, doc) can_edit_shepherd_writeup = can_edit_stream_info or user_is_person(request.user, doc.shepherd) or has_role(request.user, ["Area Director"]) + can_edit_consensus = False consensus = None - if doc.stream_id in ("ietf", "irtf", "iab"): + if doc.stream_id == "ietf" and iesg_state: + show_in_states = set(IESG_BALLOT_ACTIVE_STATES) + show_in_states.update(('approved','ann','rfcqueue','pub')) + if iesg_state.slug in show_in_states: + can_edit_consensus = can_edit + e = doc.latest_event(ConsensusDocEvent, type="changed_consensus") + consensus = nice_consensus(e and e.consensus) + elif doc.stream_id in ("irtf", "iab"): + can_edit_consensus = can_edit or can_edit_stream_info e = doc.latest_event(ConsensusDocEvent, type="changed_consensus") consensus = nice_consensus(e and e.consensus) @@ -339,6 +348,7 @@ def document_main(request, name, rev=None): can_edit_stream_info=can_edit_stream_info, can_edit_shepherd_writeup=can_edit_shepherd_writeup, can_edit_iana_state=can_edit_iana_state, + can_edit_consensus=can_edit_consensus, rfc_number=rfc_number, draft_name=draft_name, diff --git a/ietf/templates/doc/document_draft.html b/ietf/templates/doc/document_draft.html index 08ab459ce..bcf7cd8a4 100644 --- a/ietf/templates/doc/document_draft.html +++ b/ietf/templates/doc/document_draft.html @@ -121,7 +121,7 @@ Consensus: - + {{ consensus }}