Merge lp:~intellectronica/launchpad/bug-supervisor-no-redirect into lp:launchpad

[Eleanor Berger]

[Eleanor Berger (intellectronica)]

This branch disables to Ubuntu +filebug redirect for Ubuntu's bug supervisor, as per requests by the project development team

[Brad Crittenden (bac)]

review: Approve (release-critical)

[Graham Binns (gmb)]

review: Approve (code)

=== modified file 'lib/lp/bugs/browser/bugtarget.py'
--- lib/lp/bugs/browser/bugtarget.py	2009-09-22 15:14:14 +0000
+++ lib/lp/bugs/browser/bugtarget.py	2009-09-23 10:08:05 +0000
@@ -351,7 +351,8 @@
         return (
             self.request.form.get('no-redirect') is not None or
             [key for key in self.request.form.keys()
-             if 'field.actions' in key] != [])
+             if 'field.actions' in key] != [] or
+             self.user.inTeam(self.context.bug_supervisor))
 
     def getPackageNameFieldCSSClass(self):
         """Return the CSS class for the packagename field."""
 
=== modified file 'lib/lp/bugs/stories/guided-filebug/xx-ubuntu-filebug.txt'
--- lib/lp/bugs/stories/guided-filebug/xx-ubuntu-filebug.txt	2009-09-22 16:31:43 +0000
+++ lib/lp/bugs/stories/guided-filebug/xx-ubuntu-filebug.txt	2009-09-23 10:08:05 +0000
@@ -42,6 +42,20 @@
     >>> print user_browser.url
     http://bugs.launchpad.dev/ubuntu/+source/pmount/+filebug?no-redirect
 
+Ubuntu's bug supervisor doesn't get automatically redirected either.
+
+    >>> from zope.component import getUtility
+    >>> from canonical.launchpad.interfaces import IDistributionSet, IPersonSet
+    >>> login('[e-mail]')
+    >>> ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
+    >>> foobar = getUtility(IPersonSet).getByName('name16')
+    >>> ubuntu.setBugSupervisor(foobar, foobar)
+    >>> transaction.commit()
+    >>> logout()
+
+    >>> admin_browser.open('http://bugs.launchpad.dev/ubuntu/+filebug')
+    >>> print admin_browser.title
+    Report a bug about Ubuntu...
 
 Filing bugs with Apport also allows us to get to the bug filing interface.