aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormsapiro <>2007-06-12 21:53:14 +0000
committermsapiro <>2007-06-12 21:53:14 +0000
commitb2e780a1de9c2263b56ce77b280989fd22bff3cc (patch)
tree7d2f5fa594d1e4f49d713453338b49bc4773f41b
parent68acc2bf8dea9acc285ceb55b231c8d08d18d9be (diff)
downloadmailman2-b2e780a1de9c2263b56ce77b280989fd22bff3cc.tar.gz
mailman2-b2e780a1de9c2263b56ce77b280989fd22bff3cc.tar.xz
mailman2-b2e780a1de9c2263b56ce77b280989fd22bff3cc.zip
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".
-rw-r--r--Mailman/Cgi/admindb.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/Mailman/Cgi/admindb.py b/Mailman/Cgi/admindb.py
index 6e8b58f8..75cc66a0 100644
--- a/Mailman/Cgi/admindb.py
+++ b/Mailman/Cgi/admindb.py
@@ -190,7 +190,8 @@ def main():
+ ' <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() +
'&nbsp;' +
@@ -238,7 +239,7 @@ def main():
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() +
'&nbsp;' +
@@ -382,6 +383,8 @@ def show_helds_overview(mlist, form):
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', absolute=1)
table = Table(border=0)