------------------------------------------------------------
revno: 1174
committer: Mark Sapiro <msap...@value.net>
branch nick: 2.2
timestamp: Tue 2011-06-07 15:43:58 -0700
message:
  The user options 'list my other subscriptions' page now indicates for
  each list if the subscription is 'nomail' or 'digest'.  Bug #793669.
modified:
  Mailman/Cgi/options.py
  NEWS


--
lp:mailman/2.2
https://code.launchpad.net/~mailman-coders/mailman/2.2

Your team Mailman Checkins is subscribed to branch lp:mailman/2.2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~mailman-coders/mailman/2.2/+edit-subscription
=== modified file 'Mailman/Cgi/options.py'
--- Mailman/Cgi/options.py	2011-05-10 01:36:35 +0000
+++ Mailman/Cgi/options.py	2011-06-07 22:43:58 +0000
@@ -299,8 +299,14 @@
         # the user is a member.  If so, add it to the list.
         onlists = []
         for gmlist in lists_of_member(mlist, user) + [mlist]:
+            extra = ''
             url = gmlist.GetOptionsURL(user)
             link = Link(url, gmlist.real_name)
+            if gmlist.getDeliveryStatus(user) <> MemberAdaptor.ENABLED:
+                extra += ', ' + _('nomail')
+            if user in gmlist.getDigestMemberKeys():
+                extra += ', ' + _('digest')
+            link = HTMLFormatObject(link, 0) + extra
             onlists.append((gmlist.real_name, link))
         onlists.sort()
         items = OrderedList(*[link for name, link in onlists])

=== modified file 'NEWS'
--- NEWS	2011-06-02 18:08:43 +0000
+++ NEWS	2011-06-07 22:43:58 +0000
@@ -82,6 +82,9 @@
 
   New Features
 
+    - The user options 'list my other subscriptions' page now indicates for
+      each list if the subscription is 'nomail' or 'digest'.  Bug #793669.
+
     - A new list poster password has been implemented.  This password may only
       be used in Approved: or X-Approved: headers for pre-approving posts.
       Using this password for that purpose precludes compromise of a more

_______________________________________________
Mailman-checkins mailing list
Mailman-checkins@python.org
Unsubscribe: 
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org

Reply via email to