diff options
| author | mailman | 1998-03-26 05:03:13 +0000 |
|---|---|---|
| committer | mailman | 1998-03-26 05:03:13 +0000 |
| commit | f1708fc2471a7c9e2e47edca47b0450dd0488566 (patch) | |
| tree | b9ded83b7a8ead2d3efc7bfa5052bb0ca4d27cd7 | |
| parent | aa8ad06cf3d1c8e389e4cae0714541d3aeca1e69 (diff) | |
| download | mailman-f1708fc2471a7c9e2e47edca47b0450dd0488566.tar.gz mailman-f1708fc2471a7c9e2e47edca47b0450dd0488566.tar.zst mailman-f1708fc2471a7c9e2e47edca47b0450dd0488566.zip | |
| -rw-r--r-- | Mailman/HTMLFormatter.py | 12 | ||||
| -rw-r--r-- | modules/mm_html.py | 12 |
2 files changed, 18 insertions, 6 deletions
diff --git a/Mailman/HTMLFormatter.py b/Mailman/HTMLFormatter.py index 33f3aca38..5e1aefe83 100644 --- a/Mailman/HTMLFormatter.py +++ b/Mailman/HTMLFormatter.py @@ -56,21 +56,27 @@ class HTMLFormatter: else: concealed = "" - def FormatOneUser(person, me=self): + def FormatOneUser(person, me=self, disdel=mm_cfg.DisableDelivery): import htmlformat, os id = mm_utils.ObscureEmail(person) if me.obscure_addresses: showing = mm_utils.ObscureEmail(person, for_text=1) else: showing = person - return htmlformat.Link(os.path.join(me.GetScriptURL('options'), - id), showing) + got = htmlformat.Link(os.path.join(me.GetScriptURL('options'), + id), showing) + if me.GetUserOption(person, disdel): + got = htmlformat.Italic("(", + got, + ")") + return got items = map(FormatOneUser, people) # Just return the .Format() so this works until I finish # converting everything to htmlformat... return (concealed + apply(htmlformat.UnorderedList, tuple(items)).Format()) + def FormatOptionButton(self, type, value, user): users_val = self.GetUserOption(user, type) if users_val == value: diff --git a/modules/mm_html.py b/modules/mm_html.py index 33f3aca38..5e1aefe83 100644 --- a/modules/mm_html.py +++ b/modules/mm_html.py @@ -56,21 +56,27 @@ class HTMLFormatter: else: concealed = "" - def FormatOneUser(person, me=self): + def FormatOneUser(person, me=self, disdel=mm_cfg.DisableDelivery): import htmlformat, os id = mm_utils.ObscureEmail(person) if me.obscure_addresses: showing = mm_utils.ObscureEmail(person, for_text=1) else: showing = person - return htmlformat.Link(os.path.join(me.GetScriptURL('options'), - id), showing) + got = htmlformat.Link(os.path.join(me.GetScriptURL('options'), + id), showing) + if me.GetUserOption(person, disdel): + got = htmlformat.Italic("(", + got, + ")") + return got items = map(FormatOneUser, people) # Just return the .Format() so this works until I finish # converting everything to htmlformat... return (concealed + apply(htmlformat.UnorderedList, tuple(items)).Format()) + def FormatOptionButton(self, type, value, user): users_val = self.GetUserOption(user, type) if users_val == value: |