diff options
| author | Mark Sapiro <msapiro@value.net> | 2011-06-07 15:41:51 -0700 |
|---|---|---|
| committer | Mark Sapiro <msapiro@value.net> | 2011-06-07 15:41:51 -0700 |
| commit | 13b632e25cef820df83370be1b2689e9f723e3b6 (patch) | |
| tree | b5c6bf218d1dffc43bccfc568d435c43d50f0934 /Mailman/Cgi/options.py | |
| parent | b7178b303cfb14b2a26ef5c3011ab1df2da34af7 (diff) | |
| download | mailman2-13b632e25cef820df83370be1b2689e9f723e3b6.tar.gz mailman2-13b632e25cef820df83370be1b2689e9f723e3b6.tar.xz mailman2-13b632e25cef820df83370be1b2689e9f723e3b6.zip | |
The user options 'list my other subscriptions' page now indicates for
each list if the subscription is 'nomail' or 'digest'. Bug #793669.
Diffstat (limited to 'Mailman/Cgi/options.py')
| -rw-r--r-- | Mailman/Cgi/options.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Mailman/Cgi/options.py b/Mailman/Cgi/options.py index 6316af6e..9a2389a9 100644 --- a/Mailman/Cgi/options.py +++ b/Mailman/Cgi/options.py @@ -298,8 +298,14 @@ def main(): # 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]) |