------------------------------------------------------------
revno: 1247
committer: Mark Sapiro <msap...@value.net>
branch nick: 2.2
timestamp: Wed 2013-04-03 15:26:38 -0700
message:
The pending (un)subscriptions waiting approval are now sorted by email
address in the admindb interface as intended. (LP: 1164160)
modified:
Mailman/Cgi/admindb.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/admindb.py'
--- Mailman/Cgi/admindb.py 2011-12-31 22:25:00 +0000
+++ Mailman/Cgi/admindb.py 2013-04-03 22:26:38 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 1998-2011 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2013 by the Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -314,10 +314,10 @@
for id in pendingsubs:
addr = mlist.GetRecord(id)[1]
byaddrs.setdefault(addr, []).append(id)
- addrs = byaddrs.keys()
+ addrs = byaddrs.items()
addrs.sort()
num = 0
- for addr, ids in byaddrs.items():
+ for addr, ids in addrs:
# Eliminate duplicates
for id in ids[1:]:
mlist.HandleRequest(id, mm_cfg.DISCARD)
@@ -365,10 +365,10 @@
for id in pendingunsubs:
addr = mlist.GetRecord(id)
byaddrs.setdefault(addr, []).append(id)
- addrs = byaddrs.keys()
+ addrs = byaddrs.items()
addrs.sort()
num = 0
- for addr, ids in byaddrs.items():
+ for addr, ids in addrs:
# Eliminate duplicates
for id in ids[1:]:
mlist.HandleRequest(id, mm_cfg.DISCARD)
=== modified file 'NEWS'
--- NEWS 2013-03-28 22:45:56 +0000
+++ NEWS 2013-04-03 22:26:38 +0000
@@ -102,6 +102,9 @@
Bug Fixes and other patches
+ - The pending (un)subscriptions waiting approval are now sorted by email
+ address in the admindb interface as intended. (LP: 1164160)
+
- The subscribe log entry for a bin/add_members subscribe now identifies
bin/add_members as the source. (LP: 1161642)
_______________________________________________
Mailman-checkins mailing list
Mailman-checkins@python.org
Unsubscribe:
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
