Revision: 8236
http://svn.sourceforge.net/mailman/?rev=8236&view=rev
Author: msapiro
Date: 2007-06-12 14:57:25 -0700 (Tue, 12 Jun 2007)
Log Message:
-----------
admindb.py - Changed to not show the "Discard all messages marked Defer"
checkbox
when there are only (un)subscribes and no held messages.
- Added a separator and heading for "Held Messages" like the ones for
"Subscribe Requests" and "Unsubscribe Requests".
- Added additional test to not display "Database Updated ..." when
coming from the login page.
Modified Paths:
--------------
trunk/mailman/Mailman/Cgi/admindb.py
Modified: trunk/mailman/Mailman/Cgi/admindb.py
===================================================================
--- trunk/mailman/Mailman/Cgi/admindb.py 2007-06-12 21:53:14 UTC (rev
8235)
+++ trunk/mailman/Mailman/Cgi/admindb.py 2007-06-12 21:57:25 UTC (rev
8236)
@@ -136,9 +136,9 @@
mlist.Lock()
try:
realname = mlist.real_name
- if not cgidata.keys():
+ if not cgidata.keys() or cgidata.has_key('admlogin'):
# If this is not a form submission (i.e. there are no keys in the
- # form), then we don't need to do much special.
+ # form) or it's a login, then we don't need to do much special.
doc.SetTitle(_('%(realname)s Administrative Database'))
elif not details:
# This is a form submission
@@ -172,7 +172,8 @@
+ ' <em>%s</em>' % mlist.real_name))
if details <> 'instructions':
form.AddItem(Center(SubmitButton('submit', _('Submit All Data'))))
- if not (details or sender or msgid):
+ nomessages = not mlist.GetHeldMessageIds()
+ if not (details or sender or msgid or nomessages):
form.AddItem(Center(
CheckBox('discardalldefersp', 0).Format() +
' ' +
@@ -220,7 +221,7 @@
if addform:
doc.AddItem(form)
form.AddItem('<hr>')
- if not (details or sender or msgid):
+ if not (details or sender or msgid or nomessages):
form.AddItem(Center(
CheckBox('discardalldefersp', 0).Format() +
' ' +
@@ -364,6 +365,8 @@
bysender = helds_by_sender(mlist)
if not bysender:
return 0
+ form.AddItem('<hr>')
+ form.AddItem(Center(Header(2, _('Held Messages'))))
# Add the by-sender overview tables
admindburl = mlist.GetScriptURL('admindb')
table = Table(border=0)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Mailman-checkins mailing list
[email protected]
Unsubscribe:
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
