From 5c2ea6500c6498713e82a2d373faae1dbb2f0a32 Mon Sep 17 00:00:00 2001
From: Robert Sparks <rjsparks@nostrum.com>
Date: Fri, 26 Sep 2025 14:03:36 -0500
Subject: [PATCH 1/9] feat: skeleton for modal email preview

---
 ietf/doc/tests_draft.py                      | 16 +++++++
 ietf/doc/urls.py                             |  2 +
 ietf/doc/views_ballot.py                     | 18 +++++++-
 ietf/templates/doc/ballot/edit_position.html | 48 +++++++++++++++++++-
 4 files changed, 82 insertions(+), 2 deletions(-)

diff --git a/ietf/doc/tests_draft.py b/ietf/doc/tests_draft.py
index ab33acebe6..d853c27b37 100644
--- a/ietf/doc/tests_draft.py
+++ b/ietf/doc/tests_draft.py
@@ -2,6 +2,7 @@
 # -*- coding: utf-8 -*-
 
 
+import json
 import os
 import datetime
 import io
@@ -2391,3 +2392,18 @@ def test_editorial_metadata(self):
         top_level_metadata_headings = q("tbody>tr>th:first-child").text()
         self.assertNotIn("IESG", top_level_metadata_headings)
         self.assertNotIn("IANA", top_level_metadata_headings)
+
+class BallotEmailAjaxTests(TestCase):
+    def test_ajax_build_position_email(self):
+        url = urlreverse("ietf.doc.views_ballot.ajax_build_position_email")
+        login_testing_unauthorized(self, "secretary", url)
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 405)
+        r = self.client.post(url, {})
+        response = json.loads(r.content)
+        self.assertFalse(response["success"])
+        r = self.client.post(url, {"dict is":"not empty"})
+        response = json.loads(r.content)
+        self.assertTrue(response["success"])
+        self.assertIn("email goes here",response["text"])
+
diff --git a/ietf/doc/urls.py b/ietf/doc/urls.py
index 7b444782d7..51a4064fb8 100644
--- a/ietf/doc/urls.py
+++ b/ietf/doc/urls.py
@@ -93,6 +93,8 @@
     url(r'^ballots/irsg/$', views_ballot.irsg_ballot_status),
     url(r'^ballots/rsab/$', views_ballot.rsab_ballot_status),
 
+    url(r'^build-position-email/$', views_ballot.ajax_build_position_email),
+
     url(r'^(?P<type_id>(bcp|std|fyi))/?$', views_search.index_subseries),
 
     url(r'^%(name)s(?:/%(rev)s)?/$' % settings.URL_REGEXPS, views_doc.document_main),
diff --git a/ietf/doc/views_ballot.py b/ietf/doc/views_ballot.py
index 0ba340890d..b575e11ea1 100644
--- a/ietf/doc/views_ballot.py
+++ b/ietf/doc/views_ballot.py
@@ -8,7 +8,7 @@
 
 from django import forms
 from django.conf import settings
-from django.http import HttpResponse, HttpResponseRedirect, Http404, HttpResponseBadRequest
+from django.http import HttpResponse, HttpResponseNotAllowed, HttpResponseRedirect, Http404, HttpResponseBadRequest
 from django.shortcuts import render, get_object_or_404, redirect
 from django.template.defaultfilters import striptags
 from django.template.loader import render_to_string
@@ -300,6 +300,22 @@ def err(code, text):
         content_type=f"text/plain; charset={settings.DEFAULT_CHARSET}",
     )
 
+@role_required("Area Director", "Secretariat")
+@csrf_exempt
+def ajax_build_position_email(request):
+    if request.method != "POST":
+        return HttpResponseNotAllowed(["POST"])
+    if not request.POST:
+        return HttpResponse(
+            json.dumps({"success": False, "error": "No data submitted"}),
+            content_type="application/json",
+        )
+    response = {
+        "success": True,
+        "text": "rendered email goes here"
+    } 
+    return HttpResponse(json.dumps(response), content_type="application/json")
+
 
 def build_position_email(balloter, doc, pos):
     subj = []
diff --git a/ietf/templates/doc/ballot/edit_position.html b/ietf/templates/doc/ballot/edit_position.html
index 293c186112..a60c9eca68 100644
--- a/ietf/templates/doc/ballot/edit_position.html
+++ b/ietf/templates/doc/ballot/edit_position.html
@@ -33,11 +33,18 @@ <h1>
             {% if field.name == "discuss" %}</div>{% endif %}
         {% endfor %}
         <div class="mt-3">
+            <div>Usual actions:</div>
+            <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#emailPreview">
+                Preview email
+            </button>
             <button type="submit"
                     class="btn btn-primary"
                     name="send_mail"
                     value="Save and send email">Save &amp; send email</button>
-            <button type="submit" class="btn btn-primary">Save</button>
+        </div>
+        <div class="mt-3">
+            <div>Unusual actions:</div>
+            <button type="submit" class="btn btn-warning">Save without sending email</button>
             {% if doc.type_id == "draft" or doc.type_id == "conflrev" %}
                 {% if doc.stream.slug != "irtf" %}
                     {% if ballot_deferred %}
@@ -59,6 +66,27 @@ <h1>
             </a>
         </div>
     </form>
+    <!-- Button trigger modal -->
+  
+
+    <!-- Modal -->
+    <div class="modal fade" id="emailPreview" tabindex="-1" aria-labelledby="emailPreviewLabel" aria-hidden="true">
+    <div class="modal-dialog modal-xl">
+        <div class="modal-content">
+        <div class="modal-header">
+            <h1 class="modal-title fs-5" id="emailPreviewLabel">This email has not yet been sent</h1>
+            <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+        </div>
+        <pre class="modal-body">
+            Loading
+        </pre>
+        <div class="modal-footer">
+            <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
+        </div>
+        </div>
+    </div>
+    </div>
+    <!-- End of experiment -->
 {% endblock %}
 {% block js %}
     <script>
@@ -78,4 +106,22 @@ <h1>
 
         discussToggle($("input[name=position]:checked").val());
     </script>
+
+    <script>
+        const emailPreview = document.getElementById('emailPreview')
+        if (emailPreview) {
+            emailPreview.addEventListener('show.bs.modal', async (event) => {
+                const formData = new FormData()
+                formData.append("somenot","emptyform") 
+                response = await fetch('/doc/build-position-email/', {
+                    method: 'POST',
+                    body: formData
+                })
+                // Update the modal's content.
+                const modalBody = emailPreview.querySelector('.modal-body')
+                responseJson = await response.json()
+                modalBody.textContent = responseJson.text
+            })
+        }
+    </script>
 {% endblock %}
\ No newline at end of file

From 9c1d50111a94213ac46050fcb80623e243ce061f Mon Sep 17 00:00:00 2001
From: Robert Sparks <rjsparks@nostrum.com>
Date: Fri, 26 Sep 2025 15:27:48 -0500
Subject: [PATCH 2/9] fix: rudimentary transfer of the comment and discuss text

---
 ietf/doc/tests_draft.py                      |  4 +--
 ietf/doc/views_ballot.py                     | 29 ++++++++++++++++----
 ietf/templates/doc/ballot/edit_position.html | 28 +++++++++++--------
 3 files changed, 41 insertions(+), 20 deletions(-)

diff --git a/ietf/doc/tests_draft.py b/ietf/doc/tests_draft.py
index d853c27b37..da84c213da 100644
--- a/ietf/doc/tests_draft.py
+++ b/ietf/doc/tests_draft.py
@@ -2402,8 +2402,8 @@ def test_ajax_build_position_email(self):
         r = self.client.post(url, {})
         response = json.loads(r.content)
         self.assertFalse(response["success"])
-        r = self.client.post(url, {"dict is":"not empty"})
+        r = self.client.post(url, {"dictis":"not empty"})
         response = json.loads(r.content)
         self.assertTrue(response["success"])
-        self.assertIn("email goes here",response["text"])
+        self.assertIn("Discuss:",response["text"])
 
diff --git a/ietf/doc/views_ballot.py b/ietf/doc/views_ballot.py
index b575e11ea1..a0f9d14ef9 100644
--- a/ietf/doc/views_ballot.py
+++ b/ietf/doc/views_ballot.py
@@ -300,19 +300,36 @@ def err(code, text):
         content_type=f"text/plain; charset={settings.DEFAULT_CHARSET}",
     )
 
+
 @role_required("Area Director", "Secretariat")
 @csrf_exempt
 def ajax_build_position_email(request):
     if request.method != "POST":
         return HttpResponseNotAllowed(["POST"])
-    if not request.POST:
-        return HttpResponse(
-            json.dumps({"success": False, "error": "No data submitted"}),
-            content_type="application/json",
-        )
+    debug.show("request.body")
+    # if not request.POST:
+    #     return HttpResponse(
+    #         json.dumps({"success": False, "error": "No data submitted"}),
+    #         content_type="application/json",
+    #     )
+    # debug.show("request.POST")
+    # debug.show("form")
+    # if not form.is_valid():
+    #     return HttpResponse(
+    #         json.dumps({
+    #             "success": False,
+    #             "errors": form.errors,
+    #         })
+    #     )
+    # cleaned_data = form.cleaned_data
+    # discuss = cleaned_data.get("discuss")
+    # comment = cleaned_data.get("comment")
+    post_data = json.loads(request.body)["post_data"]
+    discuss = post_data.get("discuss")
+    comment = post_data.get("comment")
     response = {
         "success": True,
-        "text": "rendered email goes here"
+        "text": f"Discuss:\n {discuss}\nComments:\n {comment}"
     } 
     return HttpResponse(json.dumps(response), content_type="application/json")
 
diff --git a/ietf/templates/doc/ballot/edit_position.html b/ietf/templates/doc/ballot/edit_position.html
index a60c9eca68..559603673e 100644
--- a/ietf/templates/doc/ballot/edit_position.html
+++ b/ietf/templates/doc/ballot/edit_position.html
@@ -65,10 +65,7 @@ <h1>
                 Back
             </a>
         </div>
-    </form>
-    <!-- Button trigger modal -->
-  
-
+    </form>  
     <!-- Modal -->
     <div class="modal fade" id="emailPreview" tabindex="-1" aria-labelledby="emailPreviewLabel" aria-hidden="true">
     <div class="modal-dialog modal-xl">
@@ -86,7 +83,6 @@ <h1 class="modal-title fs-5" id="emailPreviewLabel">This email has not yet been
         </div>
     </div>
     </div>
-    <!-- End of experiment -->
 {% endblock %}
 {% block js %}
     <script>
@@ -108,14 +104,22 @@ <h1 class="modal-title fs-5" id="emailPreviewLabel">This email has not yet been
     </script>
 
     <script>
-        const emailPreview = document.getElementById('emailPreview')
+        const emailPreview = document.getElementById("emailPreview")
         if (emailPreview) {
-            emailPreview.addEventListener('show.bs.modal', async (event) => {
-                const formData = new FormData()
-                formData.append("somenot","emptyform") 
-                response = await fetch('/doc/build-position-email/', {
-                    method: 'POST',
-                    body: formData
+            emailPreview.addEventListener("show.bs.modal", async (event) => {
+                const discuss = document.getElementById("id_discuss").value
+                const comment = document.getElementById("id_comment").value
+                const postData = {
+                    discuss: discuss,
+                    comment: comment,
+                }
+                console.log(postData)
+                response = await fetch("/doc/build-position-email/", {
+                    method: "POST",
+                    headers: {
+                        "Content-Type": "application/json"
+                    },
+                    body: JSON.stringify({"post_data": postData})
                 })
                 // Update the modal's content.
                 const modalBody = emailPreview.querySelector('.modal-body')

From 0c2935454c05c3868df9a663febc3d78677a5c7e Mon Sep 17 00:00:00 2001
From: Robert Sparks <rjsparks@nostrum.com>
Date: Fri, 26 Sep 2025 15:29:24 -0500
Subject: [PATCH 3/9] fix: put. the buttons. back.

---
 ietf/templates/doc/ballot/edit_position.html | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/ietf/templates/doc/ballot/edit_position.html b/ietf/templates/doc/ballot/edit_position.html
index 559603673e..1f07e9d107 100644
--- a/ietf/templates/doc/ballot/edit_position.html
+++ b/ietf/templates/doc/ballot/edit_position.html
@@ -33,7 +33,6 @@ <h1>
             {% if field.name == "discuss" %}</div>{% endif %}
         {% endfor %}
         <div class="mt-3">
-            <div>Usual actions:</div>
             <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#emailPreview">
                 Preview email
             </button>
@@ -41,9 +40,6 @@ <h1>
                     class="btn btn-primary"
                     name="send_mail"
                     value="Save and send email">Save &amp; send email</button>
-        </div>
-        <div class="mt-3">
-            <div>Unusual actions:</div>
             <button type="submit" class="btn btn-warning">Save without sending email</button>
             {% if doc.type_id == "draft" or doc.type_id == "conflrev" %}
                 {% if doc.stream.slug != "irtf" %}

From 8b0ea8aae58053b2fcf8f8a6e4cf7e9e74de28d7 Mon Sep 17 00:00:00 2001
From: Robert Sparks <rjsparks@nostrum.com>
Date: Wed, 1 Oct 2025 12:10:45 -0500
Subject: [PATCH 4/9] fix: transfer of the data on the current form to the
 modal

---
 ietf/doc/tests_draft.py                      |  59 ++++++++-
 ietf/doc/views_ballot.py                     | 119 ++++++++++++++-----
 ietf/templates/doc/ballot/edit_position.html |  13 +-
 3 files changed, 155 insertions(+), 36 deletions(-)

diff --git a/ietf/doc/tests_draft.py b/ietf/doc/tests_draft.py
index da84c213da..e1fffa0989 100644
--- a/ietf/doc/tests_draft.py
+++ b/ietf/doc/tests_draft.py
@@ -12,7 +12,7 @@
 from pathlib import Path
 from pyquery import PyQuery
 
-from django.db.models import Q
+from django.db.models import Max, Q
 from django.urls import reverse as urlreverse
 from django.conf import settings
 from django.utils import timezone
@@ -2395,15 +2395,62 @@ def test_editorial_metadata(self):
 
 class BallotEmailAjaxTests(TestCase):
     def test_ajax_build_position_email(self):
+        def _post_json(self, url, json_to_post):
+            r = self.client.post(
+                url, json.dumps(json_to_post), content_type="application/json"
+            )
+            self.assertEqual(r.status_code, 200)
+            return json.loads(r.content)
+
+        doc = WgDraftFactory()
+        ad = RoleFactory(
+            name_id="ad", group=doc.group, person__name="Some Areadirector"
+        ).person
         url = urlreverse("ietf.doc.views_ballot.ajax_build_position_email")
         login_testing_unauthorized(self, "secretary", url)
         r = self.client.get(url)
         self.assertEqual(r.status_code, 405)
-        r = self.client.post(url, {})
-        response = json.loads(r.content)
+        response = _post_json(self, url, {})
+        self.assertFalse(response["success"])
+        self.assertEqual(response["errors"], ["post_data not provided"])
+        response = _post_json(self, url, {"dictis": "not empty"})
+        self.assertFalse(response["success"])
+        self.assertEqual(response["errors"], ["post_data not provided"])
+        response = _post_json(self, url, {"post_data": {}})
+        self.assertFalse(response["success"])
+        self.assertEqual(len(response["errors"]), 5)
+        response = _post_json(
+            self,
+            url,
+            {
+                "post_data": {
+                    "discuss": "aaaaaa",
+                    "comment": "bbbbbb",
+                    "position": "discuss",
+                    "balloter": Person.objects.aggregate(maxpk=Max("pk")+1)["maxpk"],
+                    "docname": "this-draft-does-not-exist",
+                }
+            },
+        )
         self.assertFalse(response["success"])
-        r = self.client.post(url, {"dictis":"not empty"})
-        response = json.loads(r.content)
+        self.assertEqual(response["errors"], [
+            "No person found matching balloter",
+            "No document found matching docname"
+        ])
+        response = _post_json(
+            self,
+            url,
+            {
+                "post_data": {
+                    "discuss": "aaaaaa",
+                    "comment": "bbbbbb",
+                    "position": "discuss",
+                    "balloter": ad.pk,
+                    "docname": doc.name,
+                }
+            },
+        )
         self.assertTrue(response["success"])
-        self.assertIn("Discuss:",response["text"])
+        for snippet in ["aaaaaa", "bbbbbb", "DISCUSS", ad.plain_name(), doc.name]:
+            self.assertIn(snippet, response["text"])
 
diff --git a/ietf/doc/views_ballot.py b/ietf/doc/views_ballot.py
index a0f9d14ef9..baa85178e6 100644
--- a/ietf/doc/views_ballot.py
+++ b/ietf/doc/views_ballot.py
@@ -4,7 +4,8 @@
 # Directors and Secretariat
 
 
-import datetime, json
+import datetime
+import json
 
 from django import forms
 from django.conf import settings
@@ -41,7 +42,7 @@
 from ietf.person.models import Person
 from ietf.utils.fields import ModelMultipleChoiceField
 from ietf.utils.http import validate_return_to_path
-from ietf.utils.mail import send_mail_text, send_mail_preformatted
+from ietf.utils.mail import decode_header_value, send_mail_text, send_mail_preformatted
 from ietf.utils.decorators import require_api_key
 from ietf.utils.response import permission_denied
 from ietf.utils.timezone import date_today, datetime_from_date, DEADLINE_TZINFO
@@ -306,33 +307,97 @@ def err(code, text):
 def ajax_build_position_email(request):
     if request.method != "POST":
         return HttpResponseNotAllowed(["POST"])
-    debug.show("request.body")
-    # if not request.POST:
-    #     return HttpResponse(
-    #         json.dumps({"success": False, "error": "No data submitted"}),
-    #         content_type="application/json",
-    #     )
-    # debug.show("request.POST")
-    # debug.show("form")
-    # if not form.is_valid():
-    #     return HttpResponse(
-    #         json.dumps({
-    #             "success": False,
-    #             "errors": form.errors,
-    #         })
-    #     )
-    # cleaned_data = form.cleaned_data
-    # discuss = cleaned_data.get("discuss")
-    # comment = cleaned_data.get("comment")
-    post_data = json.loads(request.body)["post_data"]
-    discuss = post_data.get("discuss")
-    comment = post_data.get("comment")
-    response = {
-        "success": True,
-        "text": f"Discuss:\n {discuss}\nComments:\n {comment}"
-    } 
+    errors = list()
+    try:
+        json_body = json.loads(request.body)
+    except json.decoder.JSONDecodeError:
+        errors.append("Post body is not valid json")
+    if len(errors) == 0:
+        post_data = json_body.get("post_data")
+        if post_data is None:
+            errors.append("post_data not provided")
+        else:
+            for key in ["discuss", "comment", "position", "balloter", "docname"]:
+                if key not in post_data:
+                    errors.append(f"{key} not found in post_data")
+    if len(errors) == 0:
+        person = Person.objects.filter(pk=post_data.get("balloter")).first()
+        if person is None:
+            errors.append("No person found matching balloter")
+        doc = Document.objects.filter(name=post_data.get("docname")).first()
+        if doc is None:
+            errors.append("No document found matching docname")
+    if len(errors) > 0:
+        response = {
+            "success": False,
+            "errors": errors,
+        }
+    else:
+        wanted = dict()  # consider named tuple instead
+        wanted["discuss"] = post_data.get("discuss")
+        wanted["comment"] = post_data.get("comment")
+        wanted["position_name"] = post_data.get("position")
+        wanted["balloter"] = person           
+        wanted["doc"] = doc
+
+        addrs, frm, subject, body = build_position_email_from_dict(wanted)
+
+        response_text = "\n".join(
+            [
+                f"From: {decode_header_value(frm)}",
+                f"To: {', '.join([decode_header_value(addr) for addr in addrs.to])}",
+                f"Cc: {', '.join([decode_header_value(addr) for addr in addrs.cc])}",
+                f"Subject: {subject}",
+                "",
+                body,
+            ]
+        )
+
+        response = {
+            "success": True,
+            "text": response_text,
+        }
     return HttpResponse(json.dumps(response), content_type="application/json")
 
+def build_position_email_from_dict(pos_dict):
+    doc = pos_dict["doc"]
+    subj = []
+    d = ""
+    blocking_name = "DISCUSS"
+    pos_name = BallotPositionName.objects.filter(slug=pos_dict["position_name"]).first()
+    if pos_name.blocking and pos_dict.get("discuss"):
+        d = pos_dict.get("discuss")
+        blocking_name = pos_name.name.upper()
+        subj.append(blocking_name)
+    c = ""
+    if pos_dict.get("comment"):
+        c = pos_dict.get("comment")
+        subj.append("COMMENT")
+    balloter = pos_dict.get("balloter")
+    balloter_name_genitive = balloter.plain_name() + "'" if balloter.plain_name().endswith('s') else balloter.plain_name() + "'s"
+    subject = "%s %s on %s" % (balloter_name_genitive, pos_name.name if pos_name else "No Position", doc.name + "-" + doc.rev)
+    if subj:
+        subject += ": (with %s)" % " and ".join(subj)
+
+    body = render_to_string("doc/ballot/ballot_comment_mail.txt",
+                            dict(discuss=d,
+                                 comment=c,
+                                 balloter=balloter.plain_name(),
+                                 doc=doc,
+                                 pos=pos_name,
+                                 blocking_name=blocking_name,
+                                 settings=settings))
+    frm = balloter.role_email("ad").formatted_email()
+
+    if doc.stream_id == "irtf":
+        addrs = gather_address_lists('irsg_ballot_saved',doc=doc)
+    elif doc.stream_id == "editorial":
+        addrs = gather_address_lists('rsab_ballot_saved',doc=doc)
+    else:
+        addrs = gather_address_lists('iesg_ballot_saved',doc=doc)
+
+    return addrs, frm, subject, body
+
 
 def build_position_email(balloter, doc, pos):
     subj = []
diff --git a/ietf/templates/doc/ballot/edit_position.html b/ietf/templates/doc/ballot/edit_position.html
index 1f07e9d107..5cdba18282 100644
--- a/ietf/templates/doc/ballot/edit_position.html
+++ b/ietf/templates/doc/ballot/edit_position.html
@@ -20,15 +20,17 @@ <h1>
             Ballot deferred by {{ ballot_deferred.by }} on {{ ballot_deferred.time|date:"Y-m-d" }}.
         </p>
     {% endif %}
+    <div class="d-none" id="id_docname" data-value="{{doc.name}}"></div>
+    <div class="d-none" id="id_balloter" data-value="{{balloter.pk}}"></div>
     <form method="post" id="ballot-form" class="my-3">
         {% csrf_token %}
         {% for field in form %}
             {% if field.name == "discuss" %}<div id="div_id_discuss">{% endif %}
             {% bootstrap_field field %}
             {% if field.name == "discuss" and old_pos and old_pos.discuss_time %}
-                <div class="form-text mt-n3 mb-3">Last edited {{ old_pos.discuss_time }}</div>
+                <div class="form-text mt-n3 mb-3">Last saved {{ old_pos.discuss_time }}</div>
             {% elif field.name == "comment" and old_pos and old_pos.comment_time %}
-                <div class="form-text mt-n3 mb-3">Last edited {{ old_pos.comment_time }}</div>
+                <div class="form-text mt-n3 mb-3">Last saved {{ old_pos.comment_time }}</div>
             {% endif %}
             {% if field.name == "discuss" %}</div>{% endif %}
         {% endfor %}
@@ -105,11 +107,16 @@ <h1 class="modal-title fs-5" id="emailPreviewLabel">This email has not yet been
             emailPreview.addEventListener("show.bs.modal", async (event) => {
                 const discuss = document.getElementById("id_discuss").value
                 const comment = document.getElementById("id_comment").value
+                const position = document.getElementById("id_position").querySelector('input[name="position"]:checked').value
+                const docname = document.getElementById("id_docname").dataset.value
+                const balloter = document.getElementById("id_balloter").dataset.value
                 const postData = {
                     discuss: discuss,
                     comment: comment,
+                    position: position,
+                    docname: docname,
+                    balloter: balloter,
                 }
-                console.log(postData)
                 response = await fetch("/doc/build-position-email/", {
                     method: "POST",
                     headers: {

From 89776e70e70d1cb8e3b94d64de2be66b38e47803 Mon Sep 17 00:00:00 2001
From: Robert Sparks <rjsparks@nostrum.com>
Date: Thu, 2 Oct 2025 11:09:15 -0500
Subject: [PATCH 5/9] fix: pull cc_select and additional_cc foward in the
 workflow UI

---
 ietf/doc/tests_draft.py                      | 26 ++++++++---
 ietf/doc/views_ballot.py                     | 48 +++++++++++++++++---
 ietf/mailtrigger/forms.py                    |  1 +
 ietf/templates/doc/ballot/edit_position.html | 28 ++++++++++++
 4 files changed, 90 insertions(+), 13 deletions(-)

diff --git a/ietf/doc/tests_draft.py b/ietf/doc/tests_draft.py
index e1fffa0989..4d262c5a2f 100644
--- a/ietf/doc/tests_draft.py
+++ b/ietf/doc/tests_draft.py
@@ -2418,7 +2418,7 @@ def _post_json(self, url, json_to_post):
         self.assertEqual(response["errors"], ["post_data not provided"])
         response = _post_json(self, url, {"post_data": {}})
         self.assertFalse(response["success"])
-        self.assertEqual(len(response["errors"]), 5)
+        self.assertEqual(len(response["errors"]), 7)
         response = _post_json(
             self,
             url,
@@ -2427,16 +2427,18 @@ def _post_json(self, url, json_to_post):
                     "discuss": "aaaaaa",
                     "comment": "bbbbbb",
                     "position": "discuss",
-                    "balloter": Person.objects.aggregate(maxpk=Max("pk")+1)["maxpk"],
+                    "balloter": Person.objects.aggregate(maxpk=Max("pk") + 1)["maxpk"],
                     "docname": "this-draft-does-not-exist",
+                    "cc_choices": ["doc_group_mail_list"],
+                    "additional_cc": "foo@example.com",
                 }
             },
         )
         self.assertFalse(response["success"])
-        self.assertEqual(response["errors"], [
-            "No person found matching balloter",
-            "No document found matching docname"
-        ])
+        self.assertEqual(
+            response["errors"],
+            ["No person found matching balloter", "No document found matching docname"],
+        )
         response = _post_json(
             self,
             url,
@@ -2447,10 +2449,20 @@ def _post_json(self, url, json_to_post):
                     "position": "discuss",
                     "balloter": ad.pk,
                     "docname": doc.name,
+                    "cc_choices": ["doc_group_mail_list"],
+                    "additional_cc": "foo@example.com",
                 }
             },
         )
         self.assertTrue(response["success"])
-        for snippet in ["aaaaaa", "bbbbbb", "DISCUSS", ad.plain_name(), doc.name]:
+        for snippet in [
+            "aaaaaa",
+            "bbbbbb",
+            "DISCUSS",
+            ad.plain_name(),
+            doc.name,
+            doc.group.list_email,
+            "foo@example.com",
+        ]:
             self.assertIn(snippet, response["text"])
 
diff --git a/ietf/doc/views_ballot.py b/ietf/doc/views_ballot.py
index baa85178e6..a457e78ba8 100644
--- a/ietf/doc/views_ballot.py
+++ b/ietf/doc/views_ballot.py
@@ -35,12 +35,13 @@
 from ietf.doc.templatetags.ietf_filters import can_ballot
 from ietf.iesg.models import TelechatDate
 from ietf.ietfauth.utils import has_role, role_required, is_authorized_in_doc_stream
+from ietf.mailtrigger.models import Recipient
 from ietf.mailtrigger.utils import gather_address_lists
 from ietf.mailtrigger.forms import CcSelectForm
 from ietf.message.utils import infer_message
 from ietf.name.models import BallotPositionName, DocTypeName
 from ietf.person.models import Person
-from ietf.utils.fields import ModelMultipleChoiceField
+from ietf.utils.fields import ModelMultipleChoiceField, MultiEmailField
 from ietf.utils.http import validate_return_to_path
 from ietf.utils.mail import decode_header_value, send_mail_text, send_mail_preformatted
 from ietf.utils.decorators import require_api_key
@@ -180,6 +181,9 @@ def save_position(form, doc, ballot, balloter, login=None, send_email=False):
 
     return pos
 
+class AdditionalCCForm(forms.Form):
+    additional_cc = MultiEmailField(required=False)
+
 @role_required("Area Director", "Secretariat", "IRSG Member", "RSAB Member")
 def edit_position(request, name, ballot_id):
     """Vote and edit discuss and comment on document"""
@@ -200,6 +204,13 @@ def edit_position(request, name, ballot_id):
             raise Http404
         balloter = get_object_or_404(Person, pk=balloter_id)
 
+    if doc.stream_id == 'irtf':
+        mailtrigger_slug='irsg_ballot_saved'
+    elif doc.stream_id == 'editorial':
+        mailtrigger_slug='rsab_ballot_saved'
+    else:
+        mailtrigger_slug='iesg_ballot_saved'
+
     if request.method == 'POST':
         old_pos = None
         if not has_role(request.user, "Secretariat") and not can_ballot(request.user, doc):
@@ -207,7 +218,9 @@ def edit_position(request, name, ballot_id):
             permission_denied(request, "Must be an active member (not a pre-AD for example) of the balloting body to take a position")
         
         form = EditPositionForm(request.POST, ballot_type=ballot.ballot_type)
-        if form.is_valid():
+        cc_select_form = CcSelectForm(data=request.POST,mailtrigger_slug=mailtrigger_slug,mailtrigger_context={'doc':doc})
+        additional_cc_form = AdditionalCCForm(request.POST)
+        if form.is_valid() and cc_select_form.is_valid() and additional_cc_form.is_valid():
             send_mail = True if request.POST.get("send_mail") else False
             save_position(form, doc, ballot, balloter, login, send_mail)
 
@@ -236,6 +249,9 @@ def edit_position(request, name, ballot_id):
             initial['comment'] = old_pos.comment
             
         form = EditPositionForm(initial=initial, ballot_type=ballot.ballot_type)
+        cc_select_form = CcSelectForm(mailtrigger_slug=mailtrigger_slug,mailtrigger_context={'doc':doc})
+        additional_cc_form = AdditionalCCForm()
+
 
     blocking_positions = dict((p.pk, p.name) for p in form.fields["position"].queryset.all() if p.blocking)
 
@@ -244,6 +260,8 @@ def edit_position(request, name, ballot_id):
     return render(request, 'doc/ballot/edit_position.html',
                               dict(doc=doc,
                                    form=form,
+                                   cc_select_form=cc_select_form,
+                                   additional_cc_form=additional_cc_form,
                                    balloter=balloter,
                                    return_to_url=return_to_url,
                                    old_pos=old_pos,
@@ -317,7 +335,15 @@ def ajax_build_position_email(request):
         if post_data is None:
             errors.append("post_data not provided")
         else:
-            for key in ["discuss", "comment", "position", "balloter", "docname"]:
+            for key in [
+                "discuss",
+                "comment",
+                "position",
+                "balloter",
+                "docname",
+                "cc_choices",
+                "additional_cc",
+            ]:
                 if key not in post_data:
                     errors.append(f"{key} not found in post_data")
     if len(errors) == 0:
@@ -337,16 +363,26 @@ def ajax_build_position_email(request):
         wanted["discuss"] = post_data.get("discuss")
         wanted["comment"] = post_data.get("comment")
         wanted["position_name"] = post_data.get("position")
-        wanted["balloter"] = person           
+        wanted["balloter"] = person
         wanted["doc"] = doc
-
         addrs, frm, subject, body = build_position_email_from_dict(wanted)
 
+        recipient_slugs = post_data.get("cc_choices")
+        # Consider refactoring gather_address_lists so this isn't duplicated from there
+        cc_addrs = set()
+        for r in Recipient.objects.filter(slug__in=recipient_slugs):
+            cc_addrs.update(r.gather(doc=doc))
+        additional_cc = post_data.get("additional_cc")
+        for addr in additional_cc.split(","):
+            cc_addrs.add(addr.strip())
+        cc_addrs.discard("")
+        cc_addrs = sorted(list(cc_addrs))
+
         response_text = "\n".join(
             [
                 f"From: {decode_header_value(frm)}",
                 f"To: {', '.join([decode_header_value(addr) for addr in addrs.to])}",
-                f"Cc: {', '.join([decode_header_value(addr) for addr in addrs.cc])}",
+                f"Cc: {', '.join([decode_header_value(addr) for addr in cc_addrs])}",
                 f"Subject: {subject}",
                 "",
                 body,
diff --git a/ietf/mailtrigger/forms.py b/ietf/mailtrigger/forms.py
index 366c429d8c..8d13c5edf3 100644
--- a/ietf/mailtrigger/forms.py
+++ b/ietf/mailtrigger/forms.py
@@ -11,6 +11,7 @@
 class CcSelectForm(forms.Form):
     expansions = dict()                 # type: Dict[str, List[str]]
     cc_choices = forms.MultipleChoiceField(
+                   required=False,
                    label='Cc',
                    choices=[],
                    widget=forms.CheckboxSelectMultiple(),
diff --git a/ietf/templates/doc/ballot/edit_position.html b/ietf/templates/doc/ballot/edit_position.html
index 5cdba18282..b57e9a3652 100644
--- a/ietf/templates/doc/ballot/edit_position.html
+++ b/ietf/templates/doc/ballot/edit_position.html
@@ -22,6 +22,23 @@ <h1>
     {% endif %}
     <div class="d-none" id="id_docname" data-value="{{doc.name}}"></div>
     <div class="d-none" id="id_balloter" data-value="{{balloter.pk}}"></div>
+    {% if form.errors or cc_select_form.errors or additional_cc_form.errors %}
+        <div class="alert alert-danger my-3">
+                There were errors in the submitted form -- see below. Please correct these and resubmit.
+        </div>
+        {% if form.errors %}
+            <div>Position entry</div>
+            {% bootstrap_form_errors form %}
+        {% endif %}
+        {% if cc_select_form.errors %}
+            <div>CC selection</div>
+            {% bootstrap_form_errors cc_select_form %}
+        {% endif %}
+        {% if additional_cc_form.errors %}
+            <div>Additional Cc Addresses</div>
+            {% bootstrap_form_errors additional_cc_form %}
+        {% endif %}
+    {% endif %}
     <form method="post" id="ballot-form" class="my-3">
         {% csrf_token %}
         {% for field in form %}
@@ -34,6 +51,8 @@ <h1>
             {% endif %}
             {% if field.name == "discuss" %}</div>{% endif %}
         {% endfor %}
+        {% bootstrap_form cc_select_form %}
+        {% bootstrap_form additional_cc_form %}
         <div class="mt-3">
             <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#emailPreview">
                 Preview email
@@ -102,6 +121,11 @@ <h1 class="modal-title fs-5" id="emailPreviewLabel">This email has not yet been
     </script>
 
     <script>
+        function getCheckedCcValues() {
+            const checkedInputs = document.querySelectorAll('#id_cc_choices input:checked')
+            const values = Array.from(checkedInputs).map(input => input.value)
+            return values
+        }
         const emailPreview = document.getElementById("emailPreview")
         if (emailPreview) {
             emailPreview.addEventListener("show.bs.modal", async (event) => {
@@ -110,12 +134,16 @@ <h1 class="modal-title fs-5" id="emailPreviewLabel">This email has not yet been
                 const position = document.getElementById("id_position").querySelector('input[name="position"]:checked').value
                 const docname = document.getElementById("id_docname").dataset.value
                 const balloter = document.getElementById("id_balloter").dataset.value
+                const cc_choices = getCheckedCcValues()
+                const additional_cc = document.getElementById("id_additional_cc").value
                 const postData = {
                     discuss: discuss,
                     comment: comment,
                     position: position,
                     docname: docname,
                     balloter: balloter,
+                    cc_choices: cc_choices,
+                    additional_cc: additional_cc
                 }
                 response = await fetch("/doc/build-position-email/", {
                     method: "POST",

From 613165f79e2929bae8659c32c9256c66eac264b3 Mon Sep 17 00:00:00 2001
From: Robert Sparks <rjsparks@nostrum.com>
Date: Thu, 2 Oct 2025 12:14:16 -0500
Subject: [PATCH 6/9] fix: refactor where ballot email is sent

---
 ietf/doc/tests_ballot.py      | 102 +++++++++++------------------
 ietf/doc/tests_irsg_ballot.py |  63 ++++++++++--------
 ietf/doc/tests_rsab_ballot.py |  51 ++++-----------
 ietf/doc/urls.py              |   1 -
 ietf/doc/views_ballot.py      | 119 +++++++---------------------------
 5 files changed, 112 insertions(+), 224 deletions(-)

diff --git a/ietf/doc/tests_ballot.py b/ietf/doc/tests_ballot.py
index 810ee598f6..0794b88e1d 100644
--- a/ietf/doc/tests_ballot.py
+++ b/ietf/doc/tests_ballot.py
@@ -37,9 +37,18 @@
 
 
 class EditPositionTests(TestCase):
+
+    # N.B. This test needs to be rewritten to exercise all types of ballots (iesg, irsg, rsab)
+    # and test against the output of the mailtriggers instead of looking for hardcoded values
+    # in the To and CC results. See #7864
     def test_edit_position(self):
         ad = Person.objects.get(user__username="ad")
-        draft = IndividualDraftFactory(ad=ad,stream_id='ietf')
+        draft = WgDraftFactory(
+            ad=ad,
+            stream_id="ietf",
+            notify="somebody@example.com",
+            group__acronym="mars",
+        )
         ballot = create_ballot_if_not_open(None, draft, ad, 'approve')
         url = urlreverse('ietf.doc.views_ballot.edit_position', kwargs=dict(name=draft.name,
                                                           ballot_id=ballot.pk))
@@ -55,11 +64,20 @@ def test_edit_position(self):
         self.assertEqual(len(q('form textarea[name=comment]')), 1)
 
         # vote
+        empty_outbox()
         events_before = draft.docevent_set.count()
-        
-        r = self.client.post(url, dict(position="discuss",
-                                       discuss=" This is a discussion test. \n ",
-                                       comment=" This is a test. \n "))
+
+        r = self.client.post(
+            url,
+            dict(
+                position="discuss",
+                discuss=" This is a discussion test. \n ",
+                comment=" This is a test. \n ",
+                additional_cc="test298347@example.com",
+                cc_choices=["doc_notify", "doc_group_chairs"],
+                send_mail=1,
+            ),
+        )
         self.assertEqual(r.status_code, 302)
 
         pos = draft.latest_event(BallotPositionDocEvent, balloter=ad)
@@ -70,6 +88,22 @@ def test_edit_position(self):
         self.assertTrue(pos.comment_time != None)
         self.assertTrue("New position" in pos.desc)
         self.assertEqual(draft.docevent_set.count(), events_before + 3)
+        self.assertEqual(len(outbox),1)
+        m = outbox[0]
+        self.assertTrue("COMMENT" in m['Subject'])
+        self.assertTrue("DISCUSS" in m['Subject'])
+        self.assertTrue(draft.name in m['Subject'])
+        self.assertTrue("This is a discussion test." in str(m))
+        self.assertTrue("This is a test" in str(m))
+        self.assertTrue("iesg@" in m['To'])
+        # cc_choice doc_group_chairs
+        self.assertTrue("mars-chairs@" in m['Cc'])
+        # cc_choice doc_notify
+        self.assertTrue("somebody@example.com" in m['Cc'])
+        # cc_choice doc_group_email_list was not selected
+        self.assertFalse(draft.group.list_email in m['Cc'])
+        # extra-cc    
+        self.assertTrue("test298347@example.com" in m['Cc'])        
 
         # recast vote
         events_before = draft.docevent_set.count()
@@ -230,64 +264,6 @@ def test_cannot_edit_position_as_pre_ad(self):
         r = self.client.post(url, dict(position="discuss", discuss="Test discuss text"))
         self.assertEqual(r.status_code, 403)
         
-    # N.B. This test needs to be rewritten to exercise all types of ballots (iesg, irsg, rsab)
-    # and test against the output of the mailtriggers instead of looking for hardcoded values
-    # in the To and CC results. See #7864
-    def test_send_ballot_comment(self):
-        ad = Person.objects.get(user__username="ad")
-        draft = WgDraftFactory(ad=ad,group__acronym='mars')
-        draft.notify = "somebody@example.com"
-        draft.save_with_history([DocEvent.objects.create(doc=draft, rev=draft.rev, type="changed_document", by=Person.objects.get(user__username="secretary"), desc="Test")])
-
-        ballot = create_ballot_if_not_open(None, draft, ad, 'approve')
-
-        BallotPositionDocEvent.objects.create(
-            doc=draft, rev=draft.rev, type="changed_ballot_position",
-            by=ad, balloter=ad, ballot=ballot, pos=BallotPositionName.objects.get(slug="discuss"),
-            discuss="This draft seems to be lacking a clearer title?",
-            discuss_time=timezone.now(),
-            comment="Test!",
-            comment_time=timezone.now())
-        
-        url = urlreverse('ietf.doc.views_ballot.send_ballot_comment', kwargs=dict(name=draft.name,
-                                                                ballot_id=ballot.pk))
-        login_testing_unauthorized(self, "ad", url)
-
-        # normal get
-        r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
-        q = PyQuery(r.content)
-        self.assertTrue(len(q('form input[name="extra_cc"]')) > 0)
-
-        # send
-        mailbox_before = len(outbox)
-
-        r = self.client.post(url, dict(extra_cc="test298347@example.com", cc_choices=['doc_notify','doc_group_chairs']))
-        self.assertEqual(r.status_code, 302)
-
-        self.assertEqual(len(outbox), mailbox_before + 1)
-        m = outbox[-1]
-        self.assertTrue("COMMENT" in m['Subject'])
-        self.assertTrue("DISCUSS" in m['Subject'])
-        self.assertTrue(draft.name in m['Subject'])
-        self.assertTrue("clearer title" in str(m))
-        self.assertTrue("Test!" in str(m))
-        self.assertTrue("iesg@" in m['To'])
-        # cc_choice doc_group_chairs
-        self.assertTrue("mars-chairs@" in m['Cc'])
-        # cc_choice doc_notify
-        self.assertTrue("somebody@example.com" in m['Cc'])
-        # cc_choice doc_group_email_list was not selected
-        self.assertFalse(draft.group.list_email in m['Cc'])
-        # extra-cc    
-        self.assertTrue("test298347@example.com" in m['Cc'])
-
-        r = self.client.post(url, dict(cc=""))
-        self.assertEqual(r.status_code, 302)
-        self.assertEqual(len(outbox), mailbox_before + 2)
-        m = outbox[-1]
-        self.assertTrue("iesg@" in m['To'])
-        self.assertFalse(m['Cc'] and draft.group.list_email in m['Cc'])
 
 
 class BallotWriteupsTests(TestCase):
diff --git a/ietf/doc/tests_irsg_ballot.py b/ietf/doc/tests_irsg_ballot.py
index aa62d8aaf9..d96cf9dbef 100644
--- a/ietf/doc/tests_irsg_ballot.py
+++ b/ietf/doc/tests_irsg_ballot.py
@@ -355,28 +355,35 @@ def test_issue_ballot(self):
     def test_take_and_email_position(self):
         draft = RgDraftFactory()
         ballot = IRSGBallotDocEventFactory(doc=draft)
-        url = urlreverse('ietf.doc.views_ballot.edit_position', kwargs=dict(name=draft.name, ballot_id=ballot.pk)) + self.balloter
+        url = (
+            urlreverse(
+                "ietf.doc.views_ballot.edit_position",
+                kwargs=dict(name=draft.name, ballot_id=ballot.pk),
+            )
+            + self.balloter
+        )
         empty_outbox()
 
         login_testing_unauthorized(self, self.username, url)
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
 
-        r = self.client.post(url, dict(position='yes', comment='oib239sb', send_mail='Save and send email'))
+        empty_outbox()
+        r = self.client.post(
+            url,
+            dict(
+                position="yes",
+                comment="oib239sb",
+                send_mail="Save and send email",
+                cc_choices=["doc_authors", "doc_group_chairs", "doc_group_mail_list"],
+            ),
+        )
         self.assertEqual(r.status_code, 302)
         e = draft.latest_event(BallotPositionDocEvent)
-        self.assertEqual(e.pos.slug,'yes')
-        self.assertEqual(e.comment, 'oib239sb')
-
-        url = urlreverse('ietf.doc.views_ballot.send_ballot_comment', kwargs=dict(name=draft.name, ballot_id=ballot.pk)) + self.balloter
-
-        r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
-
-        r = self.client.post(url, dict(cc_choices=['doc_authors','doc_group_chairs','doc_group_mail_list'], body="Stuff"))
-        self.assertEqual(r.status_code, 302)
-        self.assertEqual(len(outbox),1)
-        self.assertNotIn('discuss-criteria', get_payload_text(outbox[0]))
+        self.assertEqual(e.pos.slug, "yes")
+        self.assertEqual(e.comment, "oib239sb")
+        self.assertEqual(len(outbox), 1)
+        self.assertNotIn("discuss-criteria", get_payload_text(outbox[0]))
 
     def test_close_ballot(self):
         draft = RgDraftFactory()
@@ -482,27 +489,31 @@ def test_cant_take_position_on_iesg_ballot(self):
     def test_take_and_email_position(self):
         draft = RgDraftFactory()
         ballot = IRSGBallotDocEventFactory(doc=draft)
-        url = urlreverse('ietf.doc.views_ballot.edit_position', kwargs=dict(name=draft.name, ballot_id=ballot.pk))
+        url = urlreverse(
+            "ietf.doc.views_ballot.edit_position",
+            kwargs=dict(name=draft.name, ballot_id=ballot.pk),
+        )
         empty_outbox()
 
         login_testing_unauthorized(self, self.username, url)
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
 
-        r = self.client.post(url, dict(position='yes', comment='oib239sb', send_mail='Save and send email'))
+        r = self.client.post(
+            url,
+            dict(
+                position="yes",
+                comment="oib239sb",
+                send_mail="Save and send email",
+                cc_choices=["doc_authors", "doc_group_chairs", "doc_group_mail_list"],
+            ),
+        )
         self.assertEqual(r.status_code, 302)
         e = draft.latest_event(BallotPositionDocEvent)
-        self.assertEqual(e.pos.slug,'yes')
-        self.assertEqual(e.comment, 'oib239sb')
-
-        url = urlreverse('ietf.doc.views_ballot.send_ballot_comment', kwargs=dict(name=draft.name, ballot_id=ballot.pk))
-
-        r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
-
-        r = self.client.post(url, dict(cc_choices=['doc_authors','doc_group_chairs','doc_group_mail_list'], body="Stuff"))
+        self.assertEqual(e.pos.slug, "yes")
+        self.assertEqual(e.comment, "oib239sb")
         self.assertEqual(r.status_code, 302)
-        self.assertEqual(len(outbox),1)
+        self.assertEqual(len(outbox), 1)
 
 class IESGMemberTests(TestCase):
 
diff --git a/ietf/doc/tests_rsab_ballot.py b/ietf/doc/tests_rsab_ballot.py
index 028f548232..9086106ba9 100644
--- a/ietf/doc/tests_rsab_ballot.py
+++ b/ietf/doc/tests_rsab_ballot.py
@@ -333,34 +333,19 @@ def test_take_and_email_position(self):
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
 
-        r = self.client.post(
-            url,
-            dict(position="yes", comment="oib239sb", send_mail="Save and send email"),
-        )
-        self.assertEqual(r.status_code, 302)
-        e = draft.latest_event(BallotPositionDocEvent)
-        self.assertEqual(e.pos.slug, "yes")
-        self.assertEqual(e.comment, "oib239sb")
-
-        url = (
-            urlreverse(
-                "ietf.doc.views_ballot.send_ballot_comment",
-                kwargs=dict(name=draft.name, ballot_id=ballot.pk),
-            )
-            + self.balloter
-        )
-
-        r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
-
         r = self.client.post(
             url,
             dict(
+                position="yes",
+                comment="oib239sb",
+                send_mail="Save and send email",
                 cc_choices=["doc_authors", "doc_group_chairs", "doc_group_mail_list"],
-                body="Stuff",
             ),
         )
         self.assertEqual(r.status_code, 302)
+        e = draft.latest_event(BallotPositionDocEvent)
+        self.assertEqual(e.pos.slug, "yes")
+        self.assertEqual(e.comment, "oib239sb")
         self.assertEqual(len(outbox), 1)
         self.assertNotIn("discuss-criteria", get_payload_text(outbox[0]))
 
@@ -532,31 +517,19 @@ def test_take_and_email_position(self):
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
 
-        r = self.client.post(
-            url,
-            dict(position="yes", comment="oib239sb", send_mail="Save and send email"),
-        )
-        self.assertEqual(r.status_code, 302)
-        e = draft.latest_event(BallotPositionDocEvent)
-        self.assertEqual(e.pos.slug, "yes")
-        self.assertEqual(e.comment, "oib239sb")
-
-        url = urlreverse(
-            "ietf.doc.views_ballot.send_ballot_comment",
-            kwargs=dict(name=draft.name, ballot_id=ballot.pk),
-        )
-
-        r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
-
         r = self.client.post(
             url,
             dict(
+                position="yes",
+                comment="oib239sb",
+                send_mail="Save and send email",
                 cc_choices=["doc_authors", "doc_group_chairs", "doc_group_mail_list"],
-                body="Stuff",
             ),
         )
         self.assertEqual(r.status_code, 302)
+        e = draft.latest_event(BallotPositionDocEvent)
+        self.assertEqual(e.pos.slug, "yes")
+        self.assertEqual(e.comment, "oib239sb")
         self.assertEqual(len(outbox), 1)
 
 
diff --git a/ietf/doc/urls.py b/ietf/doc/urls.py
index 51a4064fb8..8e9c0569e2 100644
--- a/ietf/doc/urls.py
+++ b/ietf/doc/urls.py
@@ -113,7 +113,6 @@
     url(r'^%(name)s/ballot/rsab/$' % settings.URL_REGEXPS, views_doc.document_rsab_ballot),
     url(r'^%(name)s/ballot/(?P<ballot_id>[0-9]+)/$' % settings.URL_REGEXPS, views_doc.document_ballot),
     url(r'^%(name)s/ballot/(?P<ballot_id>[0-9]+)/position/$' % settings.URL_REGEXPS, views_ballot.edit_position),
-    url(r'^%(name)s/ballot/(?P<ballot_id>[0-9]+)/emailposition/$' % settings.URL_REGEXPS, views_ballot.send_ballot_comment),
     url(r'^%(name)s/(?:%(rev)s/)?doc.json$' % settings.URL_REGEXPS, views_doc.document_json),
     url(r'^%(name)s/ballotpopup/(?P<ballot_id>[0-9]+)/$' % settings.URL_REGEXPS, views_doc.ballot_popup),
     url(r'^(?P<name>[A-Za-z0-9._+-]+)/reviewrequest/', include("ietf.doc.urls_review")),
diff --git a/ietf/doc/views_ballot.py b/ietf/doc/views_ballot.py
index a457e78ba8..711d19b546 100644
--- a/ietf/doc/views_ballot.py
+++ b/ietf/doc/views_ballot.py
@@ -217,44 +217,47 @@ def edit_position(request, name, ballot_id):
             # prevent pre-ADs from taking a position
             permission_denied(request, "Must be an active member (not a pre-AD for example) of the balloting body to take a position")
         
+        if request.POST.get("Defer") and doc.stream.slug != "irtf":
+            return redirect('ietf.doc.views_ballot.defer_ballot', name=doc)
+        elif request.POST.get("Undefer") and doc.stream.slug != "irtf":
+            return redirect('ietf.doc.views_ballot.undefer_ballot', name=doc)
+        
         form = EditPositionForm(request.POST, ballot_type=ballot.ballot_type)
         cc_select_form = CcSelectForm(data=request.POST,mailtrigger_slug=mailtrigger_slug,mailtrigger_context={'doc':doc})
         additional_cc_form = AdditionalCCForm(request.POST)
         if form.is_valid() and cc_select_form.is_valid() and additional_cc_form.is_valid():
             send_mail = True if request.POST.get("send_mail") else False
-            save_position(form, doc, ballot, balloter, login, send_mail)
-
+            pos = save_position(form, doc, ballot, balloter, login, send_mail)
             if send_mail:
-                query = {}
-                if request.GET.get('balloter'):
-                    query['balloter'] = request.GET.get('balloter')
-                if request.GET.get('ballot_edit_return_point'):
-                    query['ballot_edit_return_point'] = request.GET.get('ballot_edit_return_point')
-                qstr = ""
-                if len(query) > 0:
-                    qstr = "?" + urllib_urlencode(query, safe='/')
-                return HttpResponseRedirect(urlreverse('ietf.doc.views_ballot.send_ballot_comment', kwargs=dict(name=doc.name, ballot_id=ballot_id)) + qstr)
-            elif request.POST.get("Defer") and doc.stream.slug != "irtf":
-                return redirect('ietf.doc.views_ballot.defer_ballot', name=doc)
-            elif request.POST.get("Undefer") and doc.stream.slug != "irtf":
-                return redirect('ietf.doc.views_ballot.undefer_ballot', name=doc)
-            else:
-                return HttpResponseRedirect(return_to_url)
+                addrs, frm, subject, body = build_position_email(balloter, doc, pos)
+                if doc.stream_id == 'irtf':
+                    mailtrigger_slug='irsg_ballot_saved'
+                elif doc.stream_id == 'editorial':
+                    mailtrigger_slug='rsab_ballot_saved'
+                else:
+                    mailtrigger_slug='iesg_ballot_saved'
+                cc = []
+                cc.extend(cc_select_form.get_selected_addresses())
+                extra_cc = additional_cc_form.cleaned_data["additional_cc"]
+                if extra_cc:
+                    cc.extend(extra_cc)
+                cc_set = set(cc)
+                cc_set.discard("")
+                cc = sorted(list(cc_set))
+                send_mail_text(request, addrs.to, frm, subject, body, cc=", ".join(cc))
+            return redirect(return_to_url)
     else:
         initial = {}
         old_pos = doc.latest_event(BallotPositionDocEvent, type="changed_ballot_position", balloter=balloter, ballot=ballot)
         if old_pos:
             initial['position'] = old_pos.pos.slug
             initial['discuss'] = old_pos.discuss
-            initial['comment'] = old_pos.comment
-            
+            initial['comment'] = old_pos.comment      
         form = EditPositionForm(initial=initial, ballot_type=ballot.ballot_type)
         cc_select_form = CcSelectForm(mailtrigger_slug=mailtrigger_slug,mailtrigger_context={'doc':doc})
         additional_cc_form = AdditionalCCForm()
 
-
     blocking_positions = dict((p.pk, p.name) for p in form.fields["position"].queryset.all() if p.blocking)
-
     ballot_deferred = doc.active_defer_event()
 
     return render(request, 'doc/ballot/edit_position.html',
@@ -472,80 +475,6 @@ def build_position_email(balloter, doc, pos):
 
     return addrs, frm, subject, body
 
-@role_required('Area Director','Secretariat','IRSG Member', 'RSAB Member')
-def send_ballot_comment(request, name, ballot_id):
-    """Email document ballot position discuss/comment for Area Director."""
-    doc = get_object_or_404(Document, name=name)
-    ballot = get_object_or_404(BallotDocEvent, type="created_ballot", pk=ballot_id, doc=doc)
-
-    if not has_role(request.user, 'Secretariat'):
-        if any([
-            doc.stream_id == 'ietf' and not has_role(request.user, 'Area Director'),
-            doc.stream_id == 'irtf' and not has_role(request.user, 'IRSG Member'),
-            doc.stream_id == 'editorial' and not has_role(request.user, 'RSAB Member'),
-        ]):
-            raise Http404
-
-    balloter = request.user.person
-
-    try:
-        return_to_url = parse_ballot_edit_return_point(request.GET.get('ballot_edit_return_point'), doc.name, ballot_id)
-    except ValueError:
-        return HttpResponseBadRequest('ballot_edit_return_point is invalid')
-    
-    if 'HTTP_REFERER' in request.META:
-        back_url = request.META['HTTP_REFERER']
-    else:
-        back_url = urlreverse("ietf.doc.views_doc.document_ballot", kwargs=dict(name=doc.name, ballot_id=ballot_id))
-
-    # if we're in the Secretariat, we can select a balloter (such as an AD) to act as stand-in for
-    if has_role(request.user, "Secretariat"):
-        balloter_id = request.GET.get('balloter')
-        if not balloter_id:
-            raise Http404
-        balloter = get_object_or_404(Person, pk=balloter_id)
-
-    pos = doc.latest_event(BallotPositionDocEvent, type="changed_ballot_position", balloter=balloter, ballot=ballot)
-    if not pos:
-        raise Http404
-
-    addrs, frm, subject, body = build_position_email(balloter, doc, pos)
-
-    if doc.stream_id == 'irtf':
-        mailtrigger_slug='irsg_ballot_saved'
-    elif doc.stream_id == 'editorial':
-        mailtrigger_slug='rsab_ballot_saved'
-    else:
-        mailtrigger_slug='iesg_ballot_saved'
-        
-    if request.method == 'POST':
-        cc = []
-        cc_select_form = CcSelectForm(data=request.POST,mailtrigger_slug=mailtrigger_slug,mailtrigger_context={'doc':doc})
-        if cc_select_form.is_valid():
-            cc.extend(cc_select_form.get_selected_addresses())
-        extra_cc = [x.strip() for x in request.POST.get("extra_cc","").split(',') if x.strip()]
-        if extra_cc:
-            cc.extend(extra_cc)
-
-        send_mail_text(request, addrs.to, frm, subject, body, cc=", ".join(cc))
-            
-        return HttpResponseRedirect(return_to_url)
-
-    else: 
-
-        cc_select_form = CcSelectForm(mailtrigger_slug=mailtrigger_slug,mailtrigger_context={'doc':doc})
-  
-        return render(request, 'doc/ballot/send_ballot_comment.html',
-                      dict(doc=doc,
-                          subject=subject,
-                          body=body,
-                          frm=frm,
-                          to=addrs.as_strings().to,
-                          balloter=balloter,
-                          back_url=back_url,
-                          cc_select_form = cc_select_form,
-                      ))
-
 @role_required('Area Director','Secretariat')
 def clear_ballot(request, name, ballot_type_slug):
     """Clear all positions and discusses on every open ballot for a document."""

From f960915e74a704030ea3e93c5382c39888c26766 Mon Sep 17 00:00:00 2001
From: Robert Sparks <rjsparks@nostrum.com>
Date: Thu, 2 Oct 2025 12:21:42 -0500
Subject: [PATCH 7/9] fix: refactor build_position_email

---
 ietf/doc/views_ballot.py | 41 +++++++---------------------------------
 1 file changed, 7 insertions(+), 34 deletions(-)

diff --git a/ietf/doc/views_ballot.py b/ietf/doc/views_ballot.py
index 711d19b546..3f87e27e60 100644
--- a/ietf/doc/views_ballot.py
+++ b/ietf/doc/views_ballot.py
@@ -439,41 +439,14 @@ def build_position_email_from_dict(pos_dict):
 
 
 def build_position_email(balloter, doc, pos):
-    subj = []
-    d = ""
-    blocking_name = "DISCUSS"
-    if pos.pos.blocking and pos.discuss:
-        d = pos.discuss
-        blocking_name = pos.pos.name.upper()
-        subj.append(blocking_name)
-    c = ""
-    if pos.comment:
-        c = pos.comment
-        subj.append("COMMENT")
-
-    balloter_name_genitive = balloter.plain_name() + "'" if balloter.plain_name().endswith('s') else balloter.plain_name() + "'s"
-    subject = "%s %s on %s" % (balloter_name_genitive, pos.pos.name if pos.pos else "No Position", doc.name + "-" + doc.rev)
-    if subj:
-        subject += ": (with %s)" % " and ".join(subj)
 
-    body = render_to_string("doc/ballot/ballot_comment_mail.txt",
-                            dict(discuss=d,
-                                 comment=c,
-                                 balloter=balloter.plain_name(),
-                                 doc=doc,
-                                 pos=pos.pos,
-                                 blocking_name=blocking_name,
-                                 settings=settings))
-    frm = balloter.role_email("ad").formatted_email()
-
-    if doc.stream_id == "irtf":
-        addrs = gather_address_lists('irsg_ballot_saved',doc=doc)
-    elif doc.stream_id == "editorial":
-        addrs = gather_address_lists('rsab_ballot_saved',doc=doc)
-    else:
-        addrs = gather_address_lists('iesg_ballot_saved',doc=doc)
-
-    return addrs, frm, subject, body
+    pos_dict=dict()
+    pos_dict["doc"]=doc
+    pos_dict["position_name"]=pos.pos.slug
+    pos_dict["discuss"]=pos.discuss
+    pos_dict["comment"]=pos.comment
+    pos_dict["balloter"]=balloter
+    return build_position_email_from_dict(pos_dict)
 
 @role_required('Area Director','Secretariat')
 def clear_ballot(request, name, ballot_type_slug):

From 9f23ab3be93701e48b7978a024c1a8e85f8cbf4d Mon Sep 17 00:00:00 2001
From: Robert Sparks <rjsparks@nostrum.com>
Date: Thu, 2 Oct 2025 12:28:01 -0500
Subject: [PATCH 8/9] chore: remove abandoned imports

---
 ietf/doc/tests_ballot.py | 1 -
 ietf/doc/views_ballot.py | 1 -
 2 files changed, 2 deletions(-)

diff --git a/ietf/doc/tests_ballot.py b/ietf/doc/tests_ballot.py
index 0794b88e1d..8420e411e2 100644
--- a/ietf/doc/tests_ballot.py
+++ b/ietf/doc/tests_ballot.py
@@ -25,7 +25,6 @@
 from ietf.group.models import Group, Role
 from ietf.group.factories import GroupFactory, RoleFactory, ReviewTeamFactory
 from ietf.ipr.factories import HolderIprDisclosureFactory
-from ietf.name.models import BallotPositionName
 from ietf.iesg.models import TelechatDate
 from ietf.person.models import Person
 from ietf.person.factories import PersonFactory, PersonalApiKeyFactory
diff --git a/ietf/doc/views_ballot.py b/ietf/doc/views_ballot.py
index 3f87e27e60..03cf01a4a1 100644
--- a/ietf/doc/views_ballot.py
+++ b/ietf/doc/views_ballot.py
@@ -16,7 +16,6 @@
 from django.urls import reverse as urlreverse
 from django.views.decorators.csrf import csrf_exempt
 from django.utils.html import escape
-from urllib.parse import urlencode as urllib_urlencode
 
 import debug                            # pyflakes:ignore
 

From abdd36fd6a707c132dd4819888a8753978efd918 Mon Sep 17 00:00:00 2001
From: Robert Sparks <rjsparks@nostrum.com>
Date: Thu, 2 Oct 2025 12:36:43 -0500
Subject: [PATCH 9/9] chore: remove abandoned template

---
 .../doc/ballot/send_ballot_comment.html       | 44 -------------------
 1 file changed, 44 deletions(-)
 delete mode 100644 ietf/templates/doc/ballot/send_ballot_comment.html

diff --git a/ietf/templates/doc/ballot/send_ballot_comment.html b/ietf/templates/doc/ballot/send_ballot_comment.html
deleted file mode 100644
index 1c5f521859..0000000000
--- a/ietf/templates/doc/ballot/send_ballot_comment.html
+++ /dev/null
@@ -1,44 +0,0 @@
-{% extends "base.html" %}
-{# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin %}
-{% load django_bootstrap5 %}
-{% load ietf_filters %}
-{% block title %}Send ballot position for {{ balloter }} on {{ doc }}{% endblock %}
-{% block content %}
-    {% origin %}
-    <h1>
-        Send ballot position for {{ balloter }}
-        <br>
-        <small class="text-body-secondary">{{ doc }}</small>
-    </h1>
-    <form class="mt-3" method="post">
-        {% csrf_token %}
-        <div class="mb-3">
-            <label class="form-label" for="from">From</label>
-            <input id="from" class="form-control" type="text" placeholder="{{ frm }}" disabled>
-        </div>
-        <div class="mb-3">
-            <label class="form-label" for="to">To</label>
-            <input id="to" class="form-control" type="text" placeholder="{{ to }}" disabled>
-        </div>
-        {% bootstrap_form cc_select_form %}
-        <div class="mb-3">
-            <label class="form-label" for="additional">Additional Cc Addresses</label>
-            <input id="additional" class="form-control" type="text" name="extra_cc">
-            <div class="form-text">Separate email addresses with commas.</div>
-        </div>
-        <div class="mb-3">
-            <label class="form-label" for="subject">Subject</label>
-            <input id="subject" class="form-control" type="text" placeholder="{{ subject }}" disabled>
-        </div>
-        <div class="mb-3">
-            <p class="form-label">Body</p>
-            <pre class="border p-3">{{ body|maybewordwrap }}</pre>
-        </div>
-        <button type="submit" class="btn btn-danger">Send</button>
-        <a class="btn btn-secondary float-end"
-           href="{% url "ietf.doc.views_doc.document_main" name=doc.name %}">
-            Back
-        </a>
-    </form>
-{% endblock %}