templatetags: Add 'site_admins' tag

This lets us avoid complex templating.

Signed-off-by: Stephen Finucane <stephen@that.guru>

diff --git a/patchwork/templates/patchwork/optin-request.html b/patchwork/templates/patchwork/optin-request.html
index 3384c4628417143739461dca60c4b5762cfa861b..36744c26bbe3ed7244475356289f902376ca65ce 100644 (file)
--- a/patchwork/templates/patchwork/optin-request.html
+++ b/patchwork/templates/patchwork/optin-request.html
@@ -1,5 +1,7 @@
 {% extends "base.html" %}
 
+{% load admins %}
+
 {% block title %}Opt-in{% endblock %}
 {% block heading %}Opt-in{% endblock %}
 
@@ -40,11 +42,7 @@
 
 {% if error and admins %}
 <p>
-  If you are having trouble opting in, please email
-{% for admin in admins %}
-{% if admins|length > 1 and forloop.last %} or {% endif %}
-{{ admin.0 }} &lt;<a href="mailto:{{ admin.1 }}">{{ admin.1 }}</a>&gt;{% if admins|length > 2 and not forloop.last %}, {% endif %}
-{% endfor %}
+  If you are having trouble opting in, please email {% site_admins %}.
 </p>
 {% endif %}
 {% endif %}

diff --git a/patchwork/templates/patchwork/optout-request.html b/patchwork/templates/patchwork/optout-request.html
index 7396fd36b4dfc7543107d2f42c434132210b5a18..a89f72bbddcb56c9daff59ef7c0ab67452814d38 100644 (file)
--- a/patchwork/templates/patchwork/optout-request.html
+++ b/patchwork/templates/patchwork/optout-request.html
@@ -1,5 +1,7 @@
 {% extends "base.html" %}
 
+{% load admins %}
+
 {% block title %}Opt-out{% endblock %}
 {% block heading %}Opt-out{% endblock %}
 
@@ -42,11 +44,7 @@
 
 {% if error and admins %}
 <p>
-  If you are having trouble opting out, please email
-{% for admin in admins %}
-{% if admins|length > 1 and forloop.last %} or {% endif %}
-{{ admin.0 }} &lt;<a href="mailto:{{ admin.1 }}">{{ admin.1 }}</a>&gt;{% if admins|length > 2 and not forloop.last %}, {% endif %}
-{% endfor %}
+  If you are having trouble opting out, please email {% site_admins %}.
 </p>
 {% endif %}
 {% endif %}

diff --git a/patchwork/templatetags/admins.py b/patchwork/templatetags/admins.py
new file mode 100644 (file)
index 0000000..07a33e2
--- /dev/null
+++ b/patchwork/templatetags/admins.py
@@ -0,0 +1,27 @@
+# Patchwork - automated patch tracking system
+# Copyright (C) 2020 Stephen Finucane <stephen@that.guru>
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+from django.conf import settings
+from django import template
+from django.utils.safestring import mark_safe
+
+
+register = template.Library()
+
+
+@register.simple_tag()
+def site_admins():
+    admins = [
+        f'{admin[0]} &lt;<a href="mailto:{admin[1]}">{admin[1]}</a>&gt;'
+        for admin in settings.ADMINS
+    ]
+
+    if not admins:
+        return ''
+
+    if len(admins) == 1:
+        return mark_safe(admins[0])
+
+    return mark_safe(', '.join(admins[:-2]) + admins[-2] + ' or ' + admins[-1])