diff --git a/src/postorius/forms.py b/src/postorius/forms.py
index 8687e5b..3e7634c 100644
--- a/src/postorius/forms.py
+++ b/src/postorius/forms.py
@@ -26,6 +26,8 @@
from django.utils.version import get_complete_version
from django.contrib.sites.models import Site
+from django_mailman3.lib.mailman import get_mailman_client
+
ACTION_CHOICES = (
("hold", _("Hold for moderation")),
@@ -219,6 +221,24 @@
for address in user_emails)
+class ListAnonymousSubscribe(forms.Form):
+ """Form fields to join an existing list as an anonymous user.
+ """
+
+ email = forms.CharField(
+ label=_('Your email address'),
+ validators=[validate_email],
+ error_messages={
+ 'required': _('Please enter an email address.'),
+ 'invalid': _('Please enter a valid email address.')})
+
+ display_name = forms.CharField(
+ label=_('Your name (optional)'), required=False)
+
+ def __init__(self, *args, **kwargs):
+ super(ListAnonymousSubscribe, self).__init__(*args, **kwargs)
+
+
class ListSettingsForm(forms.Form):
"""
Base class for list settings forms.
@@ -537,10 +557,8 @@
required=False,
error_messages={
'required': _("Please choose a reply-to action.")},
- choices=(
- ('default-owner-pipeline', _('default-owner-pipeline')),
- ('default-posting-pipeline', _('default-posting-pipeline')),
- ('virgin', _('virgin'))),
+ choices=lambda: ((p, p) for p in get_mailman_client()
+ .pipelines['pipelines']),
help_text=_('Type of pipeline you want to use for this mailing list'))
diff --git a/src/postorius/middleware.py b/src/postorius/middleware.py
index 2c1f874..4dc9f59 100644
--- a/src/postorius/middleware.py
+++ b/src/postorius/middleware.py
@@ -20,10 +20,12 @@
from postorius import utils
from postorius.models import MailmanApiError
+from mailmanclient import MailmanConnectionError
class PostoriusMiddleware(object):
def process_exception(self, request, exception):
- if isinstance(exception, MailmanApiError):
+ if isinstance(exception, MailmanApiError) or isinstance(
+ exception, MailmanConnectionError):
return utils.render_api_error(request)
diff --git a/src/postorius/templates/postorius/lists/summary.html b/src/postorius/templates/postorius/lists/summary.html
index 6dc2a77..699a934 100644
--- a/src/postorius/templates/postorius/lists/summary.html
+++ b/src/postorius/templates/postorius/lists/summary.html
@@ -38,7 +38,7 @@
{# Subscription #}
{% if user.is_authenticated %}
- {% if userSubscribed %}
+ {% if user_subscribed %}
{% trans 'Subscription' %}
{% trans 'You are subscribed to this list with the following address:' %} {{ subscribed_address }}
@@ -56,6 +56,8 @@
{% trans 'Unsubscribe' %}
+ {% elif user_request_pending %}
+ {% trans "You have a subscription request pending. If you don't hear back soon, please contact the list owners." %}
{% else %}
{% trans 'Subscribe to this list' %}
@@ -70,8 +72,23 @@
{% endif %}
{% else %}
-
{% trans 'If you want to subscribe to this list, you have to log in first.' %}
+
+
{% trans 'If you want to subscribe to this list and you have an account, please log in first.' %}
{% trans 'Log In' %}
+
+
+ {% blocktrans %}
+ However you can also subscribe without creating an account.
+ If you wish to to so, please use the form below.
+ {% endblocktrans%}
+
+
+