Update of /cvsroot/mailman/mailman/Mailman/Cgi
In directory usw-pr-cvs1:/tmp/cvs-serv22521
Modified Files:
admindb.py
Log Message:
show_pending_subs(), show_pending_unsubs(): Remove duplicates both
from the web view of pending actions, and from the database.
Arguably, we should do this when we add the subscriptions in the first
place, but that's inconvenient because we don't maintain the proper
data structures in the request.db database.
Index: admindb.py
===================================================================
RCS file: /cvsroot/mailman/mailman/Mailman/Cgi/admindb.py,v
retrieving revision 2.33
retrieving revision 2.34
diff -C2 -d -r2.33 -r2.34
*** admindb.py 26 Mar 2002 20:57:28 -0000 2.33
--- admindb.py 27 Mar 2002 19:39:23 -0000 2.34
***************
*** 271,275 ****
addrs = byaddrs.keys()
addrs.sort()
! for id in reduce(lambda x, y: x + y, [byaddrs[k] for k in addrs]):
time, addr, fullname, passwd, digest, lang = mlist.GetRecord(id)
radio = RadioButtonArray(id, (_('Defer'),
--- 271,279 ----
addrs = byaddrs.keys()
addrs.sort()
! for addr, ids in byaddrs.items():
! # Eliminate duplicates
! for id in ids[1:]:
! mlist.HandleRequest(id, mm_cfg.DISCARD)
! id = ids[0]
time, addr, fullname, passwd, digest, lang = mlist.GetRecord(id)
radio = RadioButtonArray(id, (_('Defer'),
***************
*** 312,316 ****
addrs = byaddrs.keys()
addrs.sort()
! for id in reduce(lambda x, y: x + y, [byaddrs[k] for k in addrs]):
addr = mlist.GetRecord(id)
fullname = mlist.getMemberName(addr)
--- 316,324 ----
addrs = byaddrs.keys()
addrs.sort()
! for addr, ids in byaddrs.items():
! # Eliminate duplicates
! for id in ids[1:]:
! mlist.HandleREquest(id, mm_cfg.DISCARD)
! id = ids[0]
addr = mlist.GetRecord(id)
fullname = mlist.getMemberName(addr)
_______________________________________________
Mailman-checkins mailing list
[EMAIL PROTECTED]
http://mail.python.org/mailman/listinfo/mailman-checkins
