------------------------------------------------------------
revno: 1263
committer: Mark Sapiro <[email protected]>
branch nick: 2.2
timestamp: Thu 2013-07-18 20:20:26 -0700
message:
Backported the held message sorting to 2.1 and made it optional.
modified:
Mailman/Cgi/admindb.py
Mailman/Defaults.py.in
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 2013-06-21 16:36:21 +0000
+++ Mailman/Cgi/admindb.py 2013-07-19 03:20:26 +0000
@@ -429,13 +429,14 @@
return 0
form.AddItem('<hr>')
form.AddItem(Center(Header(2, _('Held Messages'))))
- # Add the sort sequence choices
- form.AddItem(Center(_('Show this list grouped/sorted by')))
- form.AddItem(Center(hacky_radio_buttons(
- 'summary_sort',
- (_('sender/sender'), _('sender/time'), _('ungrouped/time')),
- (SSENDER, SSENDERTIME, STIME),
- (ssort == SSENDER, ssort == SSENDERTIME, ssort == STIME))))
+ # Add the sort sequence choices if wanted
+ if mm_cfg.DISPLAY_HELD_SUMMARY_SORT_BUTTONS:
+ form.AddItem(Center(_('Show this list grouped/sorted by')))
+ form.AddItem(Center(hacky_radio_buttons(
+ 'summary_sort',
+ (_('sender/sender'), _('sender/time'), _('ungrouped/time')),
+ (SSENDER, SSENDERTIME, STIME),
+ (ssort == SSENDER, ssort == SSENDERTIME, ssort == STIME))))
# Add the by-sender overview tables
admindburl = mlist.GetScriptURL('admindb', absolute=1)
table = Table(border=0)
=== modified file 'Mailman/Defaults.py.in'
--- Mailman/Defaults.py.in 2013-05-20 20:50:08 +0000
+++ Mailman/Defaults.py.in 2013-07-19 03:20:26 +0000
@@ -247,6 +247,10 @@
'\xbe': '¾', # > plus high order bit
'\xa2': '¢', # " plus high order bit
}
+#
+# Shall the admindb held message summary display the grouping and sorting
+# option radio buttons?
+DISPLAY_HELD_SUMMARY_SORT_BUTTONS = No
=== modified file 'NEWS'
--- NEWS 2013-07-12 22:47:18 +0000
+++ NEWS 2013-07-19 03:20:26 +0000
@@ -9,9 +9,6 @@
New Features
- - The admindb summary of held messages now has a set of radio buttons to
- select how the held messages are sorted and grouped for display.
-
- There is a new list attribute 'subscribe_auto_approval' which is a list
of email addresses and regular expressions matching email addresses
whose subscriptions are exempt from admin approval. RFE 403066.
@@ -52,10 +49,15 @@
archive to emphasize that even if you got to the message from a
subject, date or author index, previous and next are still by thread.
-2.1.16 (xx-xxx-xxxx)
-
+2.1.16rc2 (xx-Aug-2013)
+
New Features
-
+
+ - There is a new DISPLAY_HELD_SUMMARY_SORT_BUTTONS setting which if set
+ to Yes in mm_cfg.py will display a set of radio buttons in the admindb
+ held message summary to select how the held messages are sorted and
+ grouped for display.
+
- Setting digest_size_threshhold to zero now means no digests will be
sent based on size instead of a digest being sent with every post.
(LP: #558274)
_______________________________________________
Mailman-checkins mailing list
[email protected]
Unsubscribe:
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
