Update of /cvsroot/mailman/mailman/Mailman/Cgi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27348
Modified Files:
Tag: Release_2_1-maint
admindb.py
Log Message:
[ mailman-Bugs-1047532 ] problem with "discard all ..."
[ mailman-Patches-1080477 ] discard all marked as defer
Fixed in a different way for what "all" means may confusing when partial
message list are shown. Also fixed 'details' case.
Index: admindb.py
===================================================================
RCS file: /cvsroot/mailman/mailman/Mailman/Cgi/admindb.py,v
retrieving revision 2.45.2.8
retrieving revision 2.45.2.9
diff -u -d -r2.45.2.8 -r2.45.2.9
--- admindb.py 1 Dec 2004 05:11:38 -0000 2.45.2.8
+++ admindb.py 7 Dec 2004 13:13:35 -0000 2.45.2.9
@@ -179,7 +179,7 @@
admindburl = mlist.GetScriptURL('admindb', absolute=1)
form = Form(admindburl)
# Add the instructions template
- if details:
+ if details == 'instructions':
doc.AddItem(Header(
2, _('Detailed instructions for the administrative database')))
else:
@@ -187,13 +187,14 @@
2,
_('Administrative requests for mailing list:')
+ ' <em>%s</em>' % mlist.real_name))
- if not details:
+ if details <> 'instructions':
form.AddItem(Center(SubmitButton('submit', _('Submit All Data'))))
- form.AddItem(Center(
- CheckBox('discardalldefersp', 0).Format() +
- ' ' +
- _('Discard all messages marked <em>Defer</em>')
- ))
+ if not (sender or msgid):
+ form.AddItem(Center(
+ CheckBox('discardalldefersp', 0).Format() +
+ ' ' +
+ _('Discard all messages marked <em>Defer</em>')
+ ))
# Add a link back to the overview, if we're not viewing the overview!
adminurl = mlist.GetScriptURL('admin', absolute=1)
d = {'listname' : mlist.real_name,
@@ -236,11 +237,12 @@
if addform:
doc.AddItem(form)
form.AddItem('<hr>')
- form.AddItem(Center(
- CheckBox('discardalldefersp', 0).Format() +
- ' ' +
- _('Discard all messages marked <em>Defer</em>')
- ))
+ if not (sender or msgid):
+ form.AddItem(Center(
+ CheckBox('discardalldefersp', 0).Format() +
+ ' ' +
+ _('Discard all messages marked <em>Defer</em>')
+ ))
form.AddItem(Center(SubmitButton('submit', _('Submit All Data'))))
doc.AddItem(mlist.GetMailmanFooter())
print doc.Format()
_______________________________________________
Mailman-checkins mailing list
[EMAIL PROTECTED]
Unsubscribe:
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
