From 9d5a94713ee6d80fe86b7b3023b8f06c5fe12fce Mon Sep 17 00:00:00 2001 From: Russ Housley Date: Sat, 16 Jul 2016 09:53:54 +0000 Subject: [PATCH] Clarify that the consensus field is talking about whether the doument will include the consensus boilerplate when it is published as an RFC. Fixes #1955. - Legacy-Id: 11663 --- ietf/doc/views_draft.py | 7 ++++--- ietf/templates/doc/document_draft.html | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ietf/doc/views_draft.py b/ietf/doc/views_draft.py index 40677842a..9373cbc32 100644 --- a/ietf/doc/views_draft.py +++ b/ietf/doc/views_draft.py @@ -1092,10 +1092,11 @@ def edit_ad(request, name): context_instance = RequestContext(request)) class ConsensusForm(forms.Form): - consensus = forms.ChoiceField(choices=(("Unknown", "Unknown"), ("Yes", "Yes"), ("No", "No")), required=True) + consensus = forms.ChoiceField(choices=(("Unknown", "Unknown"), ("Yes", "Yes"), ("No", "No")), + required=True, label="When published as an RFC, should the consensus boilerplate be included?") def edit_consensus(request, name): - """Change whether the draft is a consensus document or not.""" + """When this draft is published as an RFC, should it include the consensus boilerplate or not.""" doc = get_object_or_404(Document, type="draft", name=name) @@ -1113,7 +1114,7 @@ def edit_consensus(request, name): e = ConsensusDocEvent(doc=doc, type="changed_consensus", by=request.user.person) e.consensus = {"Unknown":None,"Yes":True,"No":False}[form.cleaned_data["consensus"]] if not e.consensus and doc.intended_std_level_id in ("std", "ds", "ps", "bcp"): - return HttpResponseForbidden("BCPs and Standards Track documents must have consensus") + return HttpResponseForbidden("BCPs and Standards Track documents must include the consensus boilerplate") e.desc = "Changed consensus to %s from %s" % (nice_consensus(e.consensus), nice_consensus(prev_consensus)) diff --git a/ietf/templates/doc/document_draft.html b/ietf/templates/doc/document_draft.html index 4c66aa8b3..592f7f508 100644 --- a/ietf/templates/doc/document_draft.html +++ b/ietf/templates/doc/document_draft.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{# Copyright The IETF Trust 2015, All Rights Reserved #} +{# Copyright The IETF Trust 2016, All Rights Reserved #} {% load origin %} {% load staticfiles %} {% load ietf_filters %} @@ -241,7 +241,7 @@ {% if consensus and not doc.stream_id == 'ietf' %} - Consensus + Consensus Boilerplate {% if can_edit or can_edit_stream_info %} Edit @@ -355,7 +355,7 @@ {% if consensus and doc.stream_id == 'ietf' %} - Consensus + Consensus Boilerplate {% if can_edit or can_edit_stream_info %} Edit