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

    Update some uses of pos.ad in templates to pos.balloter. Fixes ietf-tools#2863.
 - Legacy-Id: 17224
Note: SVN reference [17219] has been migrated to Git commit af0a995

Author: levkowetz

ietf/doc/views_charter.py

@@ -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'
 

ietf/templates/iesg/moderator_doc.html

@@ -56,7 +56,7 @@
   {% 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>