------------------------------------------------------------
revno: 999
committer: Mark Sapiro <[EMAIL PROTECTED]>
branch nick: 2.2
timestamp: Thu 2008-08-21 12:50:49 -0700
message:
Backports from the trunk -
- Added an 'automate' option to bin/newlist to send the notice to the
admin without the prompt.
- Changed the 'Approve' wording in the admindbdetails.html template to
'Accept/Approve' for better agreement with the button labels.
modified:
NEWS
bin/newlist
templates/en/admindbdetails.html
=== modified file 'NEWS'
--- a/NEWS 2008-08-20 00:56:58 +0000
+++ b/NEWS 2008-08-21 19:50:49 +0000
@@ -16,15 +16,21 @@
and if admin_notify_mchanges is true, a notice is sent to the list
owner using a new adminaddrchgack.txt template.
+ - Added an 'automate' option to bin/newlist to send the notice to the
+ admin without the prompt.
+
Bug fixes and other patches
- Fixed a bug in admin.py which would result in chunked pages of the
+ - Fixed a bug in admin.py which would result in chunked pages of the
membership list for members whose address begins with a non-alphanumeric
character to not be visible or retrievable.
- Changed ListAdmin.py to make rejected post messages From: the -owner
+ - Changed ListAdmin.py to make rejected post messages From: the -owner
address instead of the -bounces address.
+ - Changed the 'Approve' wording in the admindbdetails.html template to
+ 'Accept/Approve' for better agreement with the button labels.
+
2.1.11 (30-Jun-2008)
New Features
=== modified file 'bin/newlist'
--- a/bin/newlist 2008-03-03 18:06:28 +0000
+++ b/bin/newlist 2008-08-21 19:50:49 +0000
@@ -1,6 +1,6 @@
#! @PYTHON@
#
-# Copyright (C) 1998-2005 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2008 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
@@ -40,6 +40,13 @@
their list has been created. This option suppresses the prompt and
notification.
+ -a/--automate
+ This option suppresses the prompt prior to administrator notification
+ but still sends the notification. It can be used to make newlist
+ totally non-interactive but still send the notification, assuming
+ listname, listadmin-addr and admin-password are all specified on the
+ command line.
+
-h/--help
Print this help text and exit.
@@ -123,21 +130,24 @@
def main():
try:
- opts, args = getopt.getopt(sys.argv[1:], 'hql:u:e:',
- ['help', 'quiet', 'language=',
+ opts, args = getopt.getopt(sys.argv[1:], 'hqal:u:e:',
+ ['help', 'quiet', 'automate', 'language=',
'urlhost=', 'emailhost='])
except getopt.error, msg:
usage(1, msg)
lang = mm_cfg.DEFAULT_SERVER_LANGUAGE
- quiet = 0
+ quiet = False
+ automate = False
urlhost = None
emailhost = None
for opt, arg in opts:
if opt in ('-h', '--help'):
usage(0)
if opt in ('-q', '--quiet'):
- quiet = 1
+ quiet = True
+ if opt in ('-a', '--automate'):
+ automate = True
if opt in ('-l', '--language'):
lang = arg
if opt in ('-u', '--urlhost'):
@@ -225,9 +235,10 @@
sys.modules[modname].create(mlist)
# And send the notice to the list owner
- if not quiet:
+ if not quiet and not automate:
print _('Hit enter to notify %(listname)s owner...'),
sys.stdin.readline()
+ if not quiet:
siteowner = Utils.get_site_email(mlist.host_name, 'owner')
text = Utils.maketext(
'newlist.txt',
=== modified file 'templates/en/admindbdetails.html'
--- a/templates/en/admindbdetails.html 2006-07-21 05:46:44 +0000
+++ b/templates/en/admindbdetails.html 2008-08-21 19:50:49 +0000
@@ -12,7 +12,7 @@
taken now for this pending administrative request, but for held
postings, you can still forward or preserve the message (see below).
-<li><b>Approve</b> -- Approve the message, sending it on to the list.
+<li><b>Accept/Approve</b> -- Accept the message, sending it on to the list.
For membership requests, approve the change in membership status.
<li><b>Reject</b> -- Reject the message, sending a rejection notice to
--
Dormant development version (web u/i update)
https://code.launchpad.net/~mailman-coders/mailman/2.2
You are receiving this branch notification because you are subscribed to it.
_______________________________________________
Mailman-checkins mailing list
[email protected]
Unsubscribe:
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
