Merge lp:~deryck/launchpad/subscribe-to-bug-mail-twice-577768 into lp:launchpad

[Deryck Hodge]

Remove extra "Subscribe to bug mail" link.

This is a fix for bug 577768, which notes that there were two 'Subscribe
to bug mail' links on certain bug listings.

This fixes that by removing the subscribe link from the
BugTaskSearchListingMenu. There is also a tiny bit of code refactor
here to remove elif sections that return () the same as the final
catch-all return.

I didn't add a test to ensure there is only one link, since that seemed
overkill to me. The existing tests continue to pass because the primary
'subscribe to bug mail' link is still there.

= Launchpad lint =

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  lib/lp/bugs/browser/bugtask.py

[Abel Deuring (adeuring)]

review: Approve (code)

=== modified file 'lib/lp/bugs/browser/bugtask.py'
--- lib/lp/bugs/browser/bugtask.py	2010-04-26 15:45:47 +0000
+++ lib/lp/bugs/browser/bugtask.py	2010-05-18 16:40:54 +0000
@@ -2161,32 +2161,22 @@
                 'bugsupervisor',
                 'securitycontact',
                 'cve',
-                'subscribe',
                 )
         elif IDistroSeries.providedBy(bug_target):
             return (
                 'cve',
                 'nominations',
-                'subscribe',
-                )
-        elif IDistributionSourcePackage.providedBy(bug_target):
-            return (
-                'subscribe',
                 )
         elif IProduct.providedBy(bug_target):
             return (
                 'bugsupervisor',
                 'securitycontact',
                 'cve',
-                'subscribe'
                 )
         elif IProductSeries.providedBy(bug_target):
             return (
                 'nominations',
-                'subscribe',
                 )
-        elif IProjectGroup.providedBy(bug_target):
-            return ()
         else:
             return ()