aboutsummaryrefslogtreecommitdiffstats
path: root/Mailman
diff options
context:
space:
mode:
authorMark Sapiro <mark@msapiro.net>2014-12-20 11:59:12 -0800
committerMark Sapiro <mark@msapiro.net>2014-12-20 11:59:12 -0800
commitd196f39ced49094eab5d0d8d8e42308835ef1cf5 (patch)
tree014b413cb216518cf7b075ef11fc84f2dca2f499 /Mailman
parentf0ea450face0a007621753c3c44e09ec2e3c966e (diff)
downloadmailman2-d196f39ced49094eab5d0d8d8e42308835ef1cf5.tar.gz
mailman2-d196f39ced49094eab5d0d8d8e42308835ef1cf5.tar.xz
mailman2-d196f39ced49094eab5d0d8d8e42308835ef1cf5.zip
Implement a new DEFAULT_SUBSCRIBE_OR_INVITE setting to control the default
for the admin Mass Subscriptions page.
Diffstat (limited to '')
-rw-r--r--Mailman/Cgi/admin.py3
-rwxr-xr-xMailman/Defaults.py.in4
2 files changed, 6 insertions, 1 deletions
diff --git a/Mailman/Cgi/admin.py b/Mailman/Cgi/admin.py
index 47b4bafb..36a5af6e 100644
--- a/Mailman/Cgi/admin.py
+++ b/Mailman/Cgi/admin.py
@@ -1169,7 +1169,8 @@ def mass_subscribe(mlist, container):
Label(_('Subscribe these users now or invite them?')),
RadioButtonArray('subscribe_or_invite',
(_('Subscribe'), _('Invite')),
- 0, values=(0, 1))
+ mm_cfg.DEFAULT_SUBSCRIBE_OR_INVITE,
+ values=(0, 1))
])
table.AddCellInfo(table.GetCurrentRowIndex(), 0, bgcolor=GREY)
table.AddCellInfo(table.GetCurrentRowIndex(), 1, bgcolor=GREY)
diff --git a/Mailman/Defaults.py.in b/Mailman/Defaults.py.in
index 23215116..2834d98d 100755
--- a/Mailman/Defaults.py.in
+++ b/Mailman/Defaults.py.in
@@ -254,6 +254,10 @@ BROKEN_BROWSER_REPLACEMENTS = {'\x8b': '&#8249;', # single left angle quote
# SSENDERTIME -> Default to grouped by sender and sorted by time.
# STIME -> Default to ungrouped and sorted by time.
DISPLAY_HELD_SUMMARY_SORT_BUTTONS = No
+#
+# Shall the default for the admin Mass Subscription function be Invite rather
+# than Subscribe? Set to Yes in mm_cfg.py to make the default be Invite.
+DEFAULT_SUBSCRIBE_OR_INVITE = No