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

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

Browse source 
Better handling of consensus for BCPs and  standards track documents.  Partial fix for ticket 1560.
 - Legacy-Id: 10653
Note: SVN reference [10630] has been migrated to Git commit 884291fd91
This commit is contained in:
Henrik Levkowetz 2016-01-12 18:11:29 +00:00
parent 70bc268778 884291fd91
commit dec2d8ee9e
2 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ietf/doc/tests_draft.py
View file

@ -414,6 +414,13 @@ class EditInfoTests(TestCase):
self.assertEqual(draft.latest_event(ConsensusDocEvent, type="changed_consensus").consensus, True)
# reset
draft.intended_std_level_id = 'bcp'
draft.save()
r = self.client.post(url, dict(consensus="Unknown"))
self.assertEqual(r.status_code, 403) # BCPs must have a consensus
draft.intended_std_level_id = 'inf'
draft.save()
r = self.client.post(url, dict(consensus="Unknown"))
self.assertEqual(r.status_code, 302)

12
ietf/doc/views_draft.py
View file

@ -449,6 +449,16 @@ def change_intention(request, name):
c.save()
email_desc += "\n"+c.desc
de = doc.latest_event(ConsensusDocEvent, type="changed_consensus")
prev_consensus = de and de.consensus
if not prev_consensus and doc.intended_std_level_id in ("std", "ds", "ps", "bcp"):
ce = ConsensusDocEvent(doc=doc, by=login, type="changed_consensus")
ce.consensus = True
ce.desc = "Changed consensus to <b>%s</b> from %s" % (nice_consensus(True),
nice_consensus(prev_consensus))
ce.save()
email_desc += "\n"+ce.desc
doc.time = e.time
doc.save()
@ -1101,6 +1111,8 @@ def edit_consensus(request, name):
if form.cleaned_data["consensus"] != prev_consensus:
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")
e.desc = "Changed consensus to <b>%s</b> from %s" % (nice_consensus(e.consensus),
nice_consensus(prev_consensus))