diff options
| author | Mark Sapiro <msapiro@value.net> | 2013-04-03 15:23:53 -0700 |
|---|---|---|
| committer | Mark Sapiro <msapiro@value.net> | 2013-04-03 15:23:53 -0700 |
| commit | 9cdad15508bbc5a77e36edfd707dcc8c2140a340 (patch) | |
| tree | eb2eaf9794ceca605d028fb16c8ba49d21e7d0a4 /Mailman/Cgi | |
| parent | 25244ce18f64ece0781b0d7a3484e9c59f2ada98 (diff) | |
| download | mailman2-9cdad15508bbc5a77e36edfd707dcc8c2140a340.tar.gz mailman2-9cdad15508bbc5a77e36edfd707dcc8c2140a340.tar.xz mailman2-9cdad15508bbc5a77e36edfd707dcc8c2140a340.zip | |
The pending (un)subscriptions waiting approval are now sorted by email
address in the admindb interface as intended. (LP: 1164160)
Diffstat (limited to 'Mailman/Cgi')
| -rw-r--r-- | Mailman/Cgi/admindb.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Mailman/Cgi/admindb.py b/Mailman/Cgi/admindb.py index d1873321..dcca1389 100644 --- a/Mailman/Cgi/admindb.py +++ b/Mailman/Cgi/admindb.py @@ -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 @@ def show_pending_subs(mlist, form): 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 @@ def show_pending_unsubs(mlist, form): 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) |