diff options
| -rw-r--r-- | Mailman/Cgi/admindb.py | 11 | ||||
| -rwxr-xr-x | Mailman/Defaults.py.in | 10 | ||||
| -rwxr-xr-x | NEWS | 7 |
3 files changed, 20 insertions, 8 deletions
diff --git a/Mailman/Cgi/admindb.py b/Mailman/Cgi/admindb.py index fd9febe8..d3350ea7 100644 --- a/Mailman/Cgi/admindb.py +++ b/Mailman/Cgi/admindb.py @@ -50,10 +50,13 @@ i18n.set_language(mm_cfg.DEFAULT_SERVER_LANGUAGE) EXCERPT_HEIGHT = 10 EXCERPT_WIDTH = 76 -SSENDER = 0 -SSENDERTIME = 1 -STIME = 2 -ssort = SSENDER +SSENDER = mm_cfg.SSENDER +SSENDERTIME = mm_cfg.SSENDERTIME +STIME = mm_cfg.STIME +if mm_cfg.DISPLAY_HELD_SUMMARY_SORT_BUTTONS in (SSENDERTIME, STIME): + ssort = mm_cfg.DISPLAY_HELD_SUMMARY_SORT_BUTTONS +else: + ssort = SSENDER diff --git a/Mailman/Defaults.py.in b/Mailman/Defaults.py.in index ee17d344..10a2f056 100755 --- a/Mailman/Defaults.py.in +++ b/Mailman/Defaults.py.in @@ -253,7 +253,10 @@ BROKEN_BROWSER_REPLACEMENTS = {'\x8b': '‹', # single left angle quote } # # Shall the admindb held message summary display the grouping and sorting -# option radio buttons? +# option radio buttons? Set this in mm_cfg.py to one of the following: +# SSENDER -> Default to grouped and sorted by sender. +# SSENDERTIME -> Default to grouped by sender and sorted by time. +# STIME -> Default to ungrouped and sorted by time. DISPLAY_HELD_SUMMARY_SORT_BUTTONS = No @@ -1411,6 +1414,11 @@ UNSUBSCRIBE = 5 ACCEPT = 6 HOLD = 7 +# admindb summary sort button settings. All must evaluate to True. +SSENDER = 1 +SSENDERTIME = 2 +STIME = 3 + # Standard text field width TEXTFIELDWIDTH = 40 @@ -18,9 +18,10 @@ Here is a history of user visible changes to Mailman. enabled by setting ALLOW_AUTHOR_IS_LIST to Yes in mm_cfg.py. - 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. + 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. The exact setting determines the default grouping and + sorting. See the description in Defaults.py for details. - 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. |