------------------------------------------------------------
revno: 1166
committer: Mark Sapiro <[email protected]>
branch nick: 2.1
timestamp: Tue 2009-02-03 15:47:36 -0800
message:
  Fixed a bug in admindb.py in the implementation of replacing "No Reason
  Given" with the default rejection reason.  Bug #325016.
modified:
  Mailman/Cgi/admindb.py
  NEWS

=== modified file 'Mailman/Cgi/admindb.py'
--- Mailman/Cgi/admindb.py      2009-01-03 02:40:28 +0000
+++ Mailman/Cgi/admindb.py      2009-02-03 23:47:36 +0000
@@ -34,6 +34,7 @@
 from Mailman import Message
 from Mailman import i18n
 from Mailman.Handlers.Moderate import ModeratedMemberPost
+from Mailman.ListAdmin import HELDMSG
 from Mailman.ListAdmin import readMessage
 from Mailman.Cgi import Auth
 from Mailman.htmlformat import *
@@ -769,8 +770,12 @@
         forwardaddrkey = 'forward-addr-%d' % request_id
         bankey = 'ban-%d' % request_id
         # Defaults
-        msgdata = mlist.GetRecord(request_id)[5]
-        comment = msgdata.get('rejection_notice', _('[No explanation given]'))
+        if mlist.GetRecordType(request_id) == HELDMSG:
+            msgdata = mlist.GetRecord(request_id)[5]
+            comment = msgdata.get('rejection_notice',
+                                  _('[No explanation given]'))
+        else:
+            comment = _('[No explanation given]')
         preserve = 0
         forward = 0
         forwardaddr = ''

=== modified file 'NEWS'
--- NEWS        2009-01-11 17:35:00 +0000
+++ NEWS        2009-02-03 23:47:36 +0000
@@ -82,6 +82,9 @@
     - Changed scripts/driver to return a 405 status for non GET, POST, HEAD
       methods. SF patch #1578756.
 
+    - Fixed a bug in admindb.py in the implementation of replacing "No Reason
+      Given" with the default rejection reason.  Bug #325016.
+
 2.1.11 (30-Jun-2008)
 
   New Features



--
Stable, maintained release series
https://code.launchpad.net/~mailman-coders/mailman/2.1

Your team Mailman Checkins is subscribed to branch lp:mailman/stable.
To unsubscribe from this branch go to 
https://code.launchpad.net/~mailman-coders/mailman/2.1/+edit-subscription.
_______________________________________________
Mailman-checkins mailing list
[email protected]
Unsubscribe: 
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org

Reply via email to