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

Merged in [16836] from rjsparks@nostrum.com:

Browse source 
Changes to displaying the ballot_icon to account for IRSG ballots.
 - Legacy-Id: 16896
Note: SVN reference [16836] has been migrated to Git commit 6375aa3bedbd612cd519bf3dccced2465b145593
This commit is contained in:
Henrik Levkowetz 2019-10-21 19:37:36 +00:00
parent 5cbb357c73
commit 0313a4f58d
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ietf/doc/templatetags/ballot_icon.py
View file

@ -1,3 +1,4 @@
# Copyright The IETF Trust 2019, All rights reserved.
# Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
# All rights reserved. Contact: Pasi Eronen <pasi.eronen@nokia.com>
#
@ -50,7 +51,9 @@ register = template.Library()
@register.filter
def showballoticon(doc):
if doc.type_id == "draft":
if doc.get_state_slug("draft-iesg") not in IESG_BALLOT_ACTIVE_STATES:
if doc.stream_id == 'ietf' and doc.get_state_slug("draft-iesg") not in IESG_BALLOT_ACTIVE_STATES:
return False
elif doc.stream_id == 'irtf' and doc.get_state_slug("draft-stream-irtf") not in ['irsgpoll']:
return False
elif doc.type_id == "charter":
if doc.get_state_slug() not in ("intrev", "extrev", "iesgrev"):
@ -101,10 +104,17 @@ def ballot_icon(context, doc):
my_blocking = True
break
res = ['<a %s href="%s" data-toggle="modal" data-target="#modal-%d" title="IESG positions (click to show more)" class="ballot-icon"><table' % (
typename = "Unknown"
if ballot.ballot_type.slug=='approve':
typename = "IESG"
elif ballot.ballot_type.slug=='irsg-approve':
typename = "IRSG"
res = ['<a %s href="%s" data-toggle="modal" data-target="#modal-%d" title="%s positions (click to show more)" class="ballot-icon"><table' % (
right_click_string,
urlreverse("ietf.doc.views_doc.ballot_popup", kwargs=dict(name=doc.name, ballot_id=ballot.pk)),
ballot.pk,)]
ballot.pk,
typename,)]
if my_blocking:
res.append(' class="is-blocking" ')
res.append('>')

2
ietf/doc/templatetags/ietf_filters.py
View file

@ -459,6 +459,8 @@ def pos_to_label(text):
'Discuss': 'danger',
'Block': 'danger',
'Recuse': 'primary',
'Not Ready': 'danger',
'Need More Time': 'danger',
}.get(str(text), 'blank')
@register.filter