Revision: 8235
          http://svn.sourceforge.net/mailman/?rev=8235&view=rev
Author:   msapiro
Date:     2007-06-12 14:53:14 -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".

Modified Paths:
--------------
    branches/Release_2_1-maint/mailman/Mailman/Cgi/admindb.py

Modified: branches/Release_2_1-maint/mailman/Mailman/Cgi/admindb.py
===================================================================
--- branches/Release_2_1-maint/mailman/Mailman/Cgi/admindb.py   2007-06-10 
23:33:47 UTC (rev 8234)
+++ branches/Release_2_1-maint/mailman/Mailman/Cgi/admindb.py   2007-06-12 
21:53:14 UTC (rev 8235)
@@ -190,7 +190,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() +
                 '&nbsp;' +
@@ -238,7 +239,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() +
                     '&nbsp;' +
@@ -382,6 +383,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', absolute=1)
     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

Reply via email to