fix: Linkify email address lists one-by-one (#6315)

* fix: Linkify email address lists one-by-one Seems to work around a bug in mozilla/bleach. Fixes #6307 * Cosmetic change * Fix test
ietf-tools · Sep 15, 2023 · 303ff70 · 303ff70
1 parent d825888
commit 303ff70
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 7 deletions.
diff --git a/ietf/templates/doc/document_email.html b/ietf/templates/doc/document_email.html
@@ -49,8 +49,16 @@ <h2 class="my-3">Recipient expansions</h2>
                         <a href="{% url 'ietf.mailtrigger.views.show_triggers' trigger %}"
                            title="{{ desc }}">{{ trigger }}</a>
                     </td>
-                    <td>{{ to|join:', '|linkify }}</td>
-                    <td>{{ cc|join:', '|linkify }}</td>
+                    <td>
+                        {% for addr in to %}
+                            {{ addr|linkify }}{% if not forloop.last %}, {% endif %}
+                        {% endfor %}
+                    </td>
+                    <td>
+                        {% for addr in cc %}
+                            {{ addr|linkify }}{% if not forloop.last %}, {% endif %}
+                        {% endfor %}
+                    </td>
                 </tr>
             {% endfor %}
         </tbody>

diff --git a/ietf/templates/doc/review/complete_review.html b/ietf/templates/doc/review/complete_review.html
@@ -66,9 +66,7 @@ <h1>
         </p>
         <p>
             If you enter the review below, the review will be sent
-            to {{ review_to|join:", "|linkify }}
-            {% if review_cc %}, with a CC to {{ review_cc|join:", "|linkify }}{% endif %}
-            .
+            to {% for addr in to %}{{ addr|linkify }}{% if not forloop.last %}, {% endif %}{% endfor %}{% if review_cc %}, with a CC to {% for addr in cc %}{{ addr|linkify }}{% if not forloop.last %}, {% endif %}{% endfor %}{% endif %}.
         </p>
     {% elif assignment %}
         <p>

diff --git a/ietf/templates/group/email.html b/ietf/templates/group/email.html
@@ -47,8 +47,16 @@ <h2 class="mt-3">Recipient expansions</h2>
                         <a href="{% url 'ietf.mailtrigger.views.show_triggers' trigger %}"
                            title="{{ desc }}">{{ trigger }}</a>
                     </td>
-                    <td>{{ to|join:', '|unescape|linkify }}</td>
-                    <td>{{ cc|join:', '|unescape|linkify }}</td>
+                    <td>
+                        {% for addr in to %}
+                            {{ addr|linkify }}{% if not forloop.last %}, {% endif %}
+                        {% endfor %}
+                    </td>
+                    <td>
+                        {% for addr in cc %}
+                            {{ addr|linkify }}{% if not forloop.last %}, {% endif %}
+                        {% endfor %}
+                    </td>
                 </tr>
             {% endfor %}
         </tbody>