------------------------------------------------------------
revno: 1716
fixes bug: https://launchpad.net/bugs/1697097
committer: Mark Sapiro <[email protected]>
branch nick: 2.1
timestamp: Fri 2017-06-09 14:49:45 -0700
message:
Display date of held subscriptions and keep newest.
modified:
Mailman/Cgi/admindb.py
NEWS
--
lp:mailman/2.1
https://code.launchpad.net/~mailman-coders/mailman/2.1
Your team Mailman Checkins is subscribed to branch lp:mailman/2.1.
To unsubscribe from this branch go to
https://code.launchpad.net/~mailman-coders/mailman/2.1/+edit-subscription
=== modified file 'Mailman/Cgi/admindb.py'
--- Mailman/Cgi/admindb.py 2017-06-06 05:47:05 +0000
+++ Mailman/Cgi/admindb.py 2017-06-09 21:49:45 +0000
@@ -366,7 +366,7 @@
form.AddItem('<hr>')
form.AddItem(Center(Header(2, _('Subscription Requests'))))
table = Table(border=2)
- table.AddRow([Center(Bold(_('Address/name'))),
+ table.AddRow([Center(Bold(_('Address/name/time'))),
Center(Bold(_('Your decision'))),
Center(Bold(_('Reason for refusal')))
])
@@ -379,12 +379,14 @@
addrs.sort()
num = 0
for addr, ids in addrs:
- # Eliminate duplicates
- for id in ids[1:]:
+ # Eliminate duplicates.
+ # The list ws returned sorted ascending. Keep the last.
+ for id in ids[:-1]:
mlist.HandleRequest(id, mm_cfg.DISCARD)
- id = ids[0]
- time, addr, fullname, passwd, digest, lang = mlist.GetRecord(id)
+ id = ids[-1]
+ stime, addr, fullname, passwd, digest, lang = mlist.GetRecord(id)
fullname = Utils.uncanonstr(fullname, mlist.preferred_language)
+ displaytime = time.ctime(stime)
radio = RadioButtonArray(id, (_('Defer'),
_('Approve'),
_('Reject'),
@@ -401,7 +403,9 @@
'</label>')
# While the address may be a unicode, it must be ascii
paddr = addr.encode('us-ascii', 'replace')
- table.AddRow(['%s<br><em>%s</em>' % (paddr, Utils.websafe(fullname)),
+ table.AddRow(['%s<br><em>%s</em><br>%s' % (paddr,
+ Utils.websafe(fullname),
+ displaytime),
radio,
TextBox('comment-%d' % id, size=40)
])
@@ -433,6 +437,7 @@
num = 0
for addr, ids in addrs:
# Eliminate duplicates
+ # Here the order doesn't matter as the data is just the address.
for id in ids[1:]:
mlist.HandleRequest(id, mm_cfg.DISCARD)
id = ids[0]
=== modified file 'NEWS'
--- NEWS 2017-06-06 21:44:09 +0000
+++ NEWS 2017-06-09 21:49:45 +0000
@@ -7,6 +7,11 @@
2.1.25 (xx-xxx-xxxx)
+ New Features
+
+ - The admindb held subscriptions listing now includes the date of the
+ most recent request from the address. (LP: #1697097)
+
Bug fixes and other patches
- Fixed MTA/Postfix.py to ensure that created aliases(.db) and
_______________________________________________
Mailman-checkins mailing list
[email protected]
Unsubscribe:
https://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
