From af0a9954fe05912e2499eff958cd91cb7104f6b8 Mon Sep 17 00:00:00 2001
From: Robert Sparks <rjsparks@nostrum.com>
Date: Fri, 10 Jan 2020 19:04:42 +0000
Subject: [PATCH] Update some uses of pos.ad in templates to pos.balloter.
 Fixes #2863. Commit ready for merge.  - Legacy-Id: 17219

---
 ietf/doc/views_charter.py              | 4 ++--
 ietf/templates/iesg/moderator_doc.html | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ietf/doc/views_charter.py b/ietf/doc/views_charter.py
index 82a515b96..8234be4f0 100644
--- a/ietf/doc/views_charter.py
+++ b/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'
 
diff --git a/ietf/templates/iesg/moderator_doc.html b/ietf/templates/iesg/moderator_doc.html
index 532a89282..fc4a6f714 100644
--- a/ietf/templates/iesg/moderator_doc.html
+++ b/ietf/templates/iesg/moderator_doc.html
@@ -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>