aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Sapiro <msapiro@value.net>2011-04-14 16:21:01 -0700
committerMark Sapiro <msapiro@value.net>2011-04-14 16:21:01 -0700
commit67975ee0f8fdda1554ac5af976b4cc76e57edeca (patch)
treee2f624009fdb7329dcb1e0480b3b51945417f0c3
parente9ec77e3daca1779de124346a239c0e0fcfd74d7 (diff)
downloadmailman2-67975ee0f8fdda1554ac5af976b4cc76e57edeca.tar.gz
mailman2-67975ee0f8fdda1554ac5af976b4cc76e57edeca.tar.xz
mailman2-67975ee0f8fdda1554ac5af976b4cc76e57edeca.zip
Added a report of the affected members to the warnings issued when
setting a list with digest members digestable=No and when setting a list with non-digest members nondigestable=no. Bug #761232.
-rw-r--r--Mailman/Cgi/admin.py8
-rw-r--r--NEWS5
2 files changed, 10 insertions, 3 deletions
diff --git a/Mailman/Cgi/admin.py b/Mailman/Cgi/admin.py
index 5f01a319..7b1ac1dd 100644
--- a/Mailman/Cgi/admin.py
+++ b/Mailman/Cgi/admin.py
@@ -1,4 +1,4 @@
-# Copyright (C) 1998-2010 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2011 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
@@ -187,13 +187,15 @@ def main():
if not mlist.digestable and mlist.getDigestMemberKeys():
doc.addError(
_('''You have digest members, but digests are turned
- off. Those people will not receive mail.'''),
+ off. Those people will not receive mail.
+ Affected member(s) %r.''' % mlist.getDigestMemberKeys()),
tag=_('Warning: '))
if not mlist.nondigestable and mlist.getRegularMemberKeys():
doc.addError(
_('''You have regular list members but non-digestified mail is
turned off. They will receive non-digestified mail until you
- fix this problem.'''), tag=_('Warning: '))
+ fix this problem. Affected member(s) %r.''' %
+ mlist.getRegularMemberKeys()), tag=_('Warning: '))
# Glom up the results page and print it out
show_results(mlist, doc, category, subcat, cgidata)
print doc.Format()
diff --git a/NEWS b/NEWS
index 8f9308c0..db3039ae 100644
--- a/NEWS
+++ b/NEWS
@@ -37,6 +37,11 @@ Here is a history of user visible changes to Mailman.
Bug #670988.
Bug Fixes and other patches
+
+ - Added a report of the affected members to the warnings issued when
+ setting a list with digest members digestable=No and when setting a list
+ with non-digest members nondigestable=no. Bug #761232.
+
- Fixed a problem where content filtering could remove the headers from
an attached message/rfc822 part if the message in that part is
multipart/alternative and collapse_alternatives is Yes. Bug #757062.