Remove support for nomail and digest on new subscriptions

A step towards simplification as this moves to a legacy section

diff --git a/pgweb/lists/forms.py b/pgweb/lists/forms.py
index 36185b0516285477f0466356b6a8ab7910252def..0227853fee78f0aa8e4f44aef4ab3878372e4ac6 100644 (file)
--- a/pgweb/lists/forms.py
+++ b/pgweb/lists/forms.py
@@ -7,7 +7,5 @@ class SubscribeForm(forms.Form):
 
        email = forms.EmailField(max_length=100,required=True,label="Email address")
        action = forms.ChoiceField(required=True, choices=(('subscribe','Subscribe'),('unsubscribe','Unsubscribe')))
-       receive = forms.BooleanField(required=False, label="Receive mail", initial=True)
-       digest = forms.BooleanField(required=False, label="Digest only")
        lists = forms.ModelChoiceField(required=True, queryset=MailingList.objects.filter(active=True), label="Mailinglist")
 

diff --git a/pgweb/lists/views.py b/pgweb/lists/views.py
index d4faef1a75380ef2902b717b7d661c2672b8958f..07f9748241330b1a1e2eb5fd6c476a712602fa79 100644 (file)
--- a/pgweb/lists/views.py
+++ b/pgweb/lists/views.py
@@ -18,20 +18,9 @@ def subscribe(request):
                if form.is_valid():
                        if form.cleaned_data['action'] == 'subscribe':
                                mailsubject = "subscribe"
-                               # Default is get mail and not digest, in which case we send a regular
-                               # subscribe request. In other cases, we send subscribe-set which also
-                               # sets those flags.
-                               if form.cleaned_data['receive'] and not form.cleaned_data['digest']:
-                                       mailtxt = "subscribe %s\n" % form.cleaned_data['lists']
-                               else:
-                                       tags = []
-                                       if not form.cleaned_data['receive']:
-                                               tags.append('nomail')
-                                       if form.cleaned_data['digest']:
-                                               tags.append('digest')
-
-                                       mailtxt = "subscribe-set %s %s\n" % (form.cleaned_data['lists'],
-                                                                                                               ",".join(tags))
+                               # We currently only support get mail, no digest.
+                               # So send a regular subscribe request.
+                               mailtxt = "subscribe %s\n" % form.cleaned_data['lists']
                        else:
                                mailtxt = "unsubscribe %s\n" % form.cleaned_data['lists']
                                mailsubject = "unsubscribe"