altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 2 Packages Projects Releases Wiki Activity

Merged in [11663] from housley@vigilsec.com:

Browse source 
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: 11684
Note: SVN reference [11663] has been migrated to Git commit 9d5a94713e
This commit is contained in:
Henrik Levkowetz 2016-07-16 14:52:57 +00:00
parent 5f219648a6 9d5a94713e
commit d5d9d10017
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ietf/doc/views_draft.py
View file

@ -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 <b>%s</b> from %s" % (nice_consensus(e.consensus),
nice_consensus(prev_consensus))

6
ietf/templates/doc/document_draft.html
View file

@ -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' %}
<tr>
<th></th>
<th>Consensus</th>
<th>Consensus Boilerplate</th>
<td class="edit">
{% if can_edit or can_edit_stream_info %}
<a class="btn btn-default btn-xs" href="{% url "doc_edit_consensus" name=doc.name %}">Edit</a>
@ -355,7 +355,7 @@
{% if consensus and doc.stream_id == 'ietf' %}
<tr>
<th></th>
<th>Consensus</th>
<th>Consensus Boilerplate</th>
<td class="edit">
{% if can_edit or can_edit_stream_info %}
<a class="btn btn-default btn-xs" href="{% url "doc_edit_consensus" name=doc.name %}">Edit</a>