Implement a new DEFAULT_SUBSCRIBE_OR_INVITE setting to control the default

for the admin Mass Subscriptions page.

3 files changed, 10 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': '‹',  # 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
 
 
 
diff --git a/NEWS b/NEWS
index 88e3df84..c344264e 100755
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,10 @@ Here is a history of user visible changes to Mailman.
 
 2.1.19 (xx-xxx-xxxx)
 
+    - There is a new DEFAULT_SUBSCRIBE_OR_INVITE setting.  Set this to Yes
+      to make the default selection on the admin Mass Subscriptions page
+      Invite rather than Subscribe.  (LP: #1404511)
+
   New Features
 
     - There is a new list attribute in the Bounce processing section.