------------------------------------------------------------
revno: 1224
committer: Mark Sapiro <msap...@value.net>
branch nick: 2.2
timestamp: Wed 2012-08-22 21:02:29 -0700
message:
  The query fragments send_unsub_notifications_to_list_owner and
  send_unsub_ack_to_this_batch will now assume default values if not set
  in mass unsubscribe URLs.  (LP: #1032378)
modified:
  Mailman/Cgi/admin.py
  NEWS*


--
lp:mailman/2.2
https://code.launchpad.net/~mailman-coders/mailman/2.2

Your team Mailman Checkins is subscribed to branch lp:mailman/2.2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~mailman-coders/mailman/2.2/+edit-subscription
=== modified file 'Mailman/Cgi/admin.py'
--- Mailman/Cgi/admin.py	2012-02-23 16:23:21 +0000
+++ Mailman/Cgi/admin.py	2012-08-23 04:02:29 +0000
@@ -1436,10 +1436,12 @@
         removals += cgidata['unsubscribees_upload'].value
     if removals:
         names = filter(None, [n.strip() for n in removals.splitlines()])
-        send_unsub_notifications = int(
-            cgidata['send_unsub_notifications_to_list_owner'].value)
-        userack = int(
-            cgidata['send_unsub_ack_to_this_batch'].value)
+        send_unsub_notifications = safeint(
+            'send_unsub_notifications_to_list_owner',
+            mlist.admin_notify_mchanges)
+        userack = safeint(
+            'send_unsub_ack_to_this_batch',
+            mlist.send_goodbye_msg)
         unsubscribe_errors = []
         unsubscribe_success = []
         for addr in names:
@@ -1463,11 +1465,7 @@
             doc.AddItem('<p>')
     # See if this was a moderation bit operation
     if cgidata.has_key('allmodbit_btn'):
-        val = cgidata.getvalue('allmodbit_val')
-        try:
-            val = int(val)
-        except VallueError:
-            val = None
+        val = safeint('allmodbit_val')
         if val not in (0, 1):
             doc.addError(_('Bad moderation flag value'))
         else:

=== modified file 'NEWS' (properties changed: +x to -x)
--- NEWS	2012-06-27 00:51:27 +0000
+++ NEWS	2012-08-23 04:02:29 +0000
@@ -49,10 +49,14 @@
       archive to emphasize that even if you got to the message from a
       subject, date or author index, previous and next are still by thread.
 
-2.1.15-1 (xx-xxx-xxxx)
+2.1.16 (xx-xxx-xxxx)
 
   Bug Fixes and other patches
 
+    - The query fragments send_unsub_notifications_to_list_owner and
+      send_unsub_ack_to_this_batch will now assume default values if not set
+      in mass unsubscribe URLs.  (LP: #1032378)
+
     - Replaced utf-8 encoded characters in newly added German templates with
       HTML entities. (LP: #1018208)
 

_______________________________________________
Mailman-checkins mailing list
Mailman-checkins@python.org
Unsubscribe: 
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org

Reply via email to