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

Update some uses of pos.ad in templates to pos.balloter. Fixes #2863. Commit ready for merge.

Browse source 
- Legacy-Id: 17219
This commit is contained in:
Robert Sparks 2020-01-10 19:04:42 +00:00
parent a3edd91698
commit af0a9954fe
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ietf/doc/views_charter.py
View file

@ -1,4 +1,4 @@
# Copyright The IETF Trust 2011-2019, All Rights Reserved
# Copyright The IETF Trust 2011-2020, All Rights Reserved
# -*- coding: utf-8 -*-
@ -671,7 +671,7 @@ def ballot_writeupnotes(request, name):
pos.type = "changed_ballot_position"
pos.balloter = by
pos.pos_id = "yes"
pos.desc = "[Ballot Position Update] New position, %s, has been recorded for %s" % (pos.pos.name, pos.ad.plain_name())
pos.desc = "[Ballot Position Update] New position, %s, has been recorded for %s" % (pos.pos.name, pos.balloter.plain_name())
pos.save()
# Consider mailing this position to 'iesg_ballot_saved'

2
ietf/templates/iesg/moderator_doc.html
View file

@ -56,7 +56,7 @@ Parts Copyright (c) 2009 The IETF Trust, all rights reserved.
{% if ballot %}
<small><pre>
Yes No-Objection Discuss Abstain Recuse
{% for pos in ballot.all_positions %}{% if pos.old_ad %}{{pos.ad.plain_name|bracket|ljust:"22"}}{%else%}{{pos.ad.plain_name|ljust:"22"}}{%endif%} {{pos|bracketpos:"yes"}} {{pos|bracketpos:"noobj"}} {{pos|bracketpos:"discuss"}} {{pos|bracketpos:"abstain"}} {{pos|bracketpos:"recuse"}}
{% for pos in ballot.all_positions %}{% if pos.old_ad %}{{pos.balloter.plain_name|bracket|ljust:"22"}}{%else%}{{pos.balloter.plain_name|ljust:"22"}}{%endif%} {{pos|bracketpos:"yes"}} {{pos|bracketpos:"noobj"}} {{pos|bracketpos:"discuss"}} {{pos|bracketpos:"abstain"}} {{pos|bracketpos:"recuse"}}
{% endfor %}
</pre></small>