Merge lp:~thumper/launchpad/more-product-series-permissions into lp:launchpad

[Tim Penhey]

Expand launchpad.Edit on product series to include registry experts and bazaar experts.

[Tim Penhey (thumper)]

As per discussion with Curtis earlier today, added registry experts and bazaar experts to the launchpad.Edit security checker for IProductSeries.

tests: lp/registry/browser/tests/productseries-views.txt

[Paul Hummer (rockstar)]

review: Approve

=== modified file 'lib/canonical/launchpad/security.py'
--- lib/canonical/launchpad/security.py	2010-01-05 14:17:02 +0000
+++ lib/canonical/launchpad/security.py	2010-01-06 02:34:17 +0000
@@ -857,17 +857,20 @@
     usedfor = IProductSeries
 
     def checkAuthenticated(self, user):
-        """Allow product owner, Rosetta Experts, or admins."""
+        """Allow product owner, some experts, or admins."""
         if (user.inTeam(self.obj.product.owner) or
             user.inTeam(self.obj.driver)):
             # The user is the owner of the product, or the release manager.
             return True
         # Rosetta experts need to be able to upload translations.
-        rosetta_experts = getUtility(ILaunchpadCelebrities).rosetta_experts
-        if user.inTeam(rosetta_experts):
+        # Bazaar experts need to be able to change the linked branches.
+        # Registry admins are just special.
+        celebrities = getUtility(ILaunchpadCelebrities)
+        if (user.inTeam(celebrities.registry_experts) or
+            user.inTeam(celebrities.bazaar_experts) or
+            user.inTeam(celebrities.rosetta_experts)):
             return True
-        return EditByOwnersOrAdmins.checkAuthenticated(
-            self, user)
+        return EditByOwnersOrAdmins.checkAuthenticated(self, user)
 
 
 class EditBugTask(AuthorizationBase):

=== modified file 'lib/lp/registry/browser/tests/productseries-views.txt'
--- lib/lp/registry/browser/tests/productseries-views.txt	2009-12-05 02:53:07 +0000
+++ lib/lp/registry/browser/tests/productseries-views.txt	2010-01-06 02:34:17 +0000
@@ -184,6 +184,15 @@
     >>> print view.cancel_url
     http://launchpad.dev/app/simple
 
+Bazaar experts can change the branch links.
+
+    >>> from canonical.launchpad.interfaces.launchpad import (
+    ...     ILaunchpadCelebrities)
+    >>> celebrities = getUtility(ILaunchpadCelebrities)
+    >>> login_person(celebrities.bazaar_experts.teamowner)
+    >>> check_permission('launchpad.Edit', view)
+    True
+
 
 Delete ProductSeries
 --------------------
@@ -219,6 +228,12 @@
     >>> check_permission('launchpad.Edit', view)
     True
 
+Registry experts can also access the view.
+
+    >>> login_person(celebrities.registry_experts.teamowner)
+    >>> check_permission('launchpad.Edit', view)
+    True
+
 The delete view has a label and page_title to explain what it does.
 
     >>> print view.label
@@ -394,10 +409,8 @@
 avoid conflicts. The linked branch is removed.
 
     >>> from zope.component import getUtility
-    >>> from canonical.launchpad.interfaces.launchpad import (
-    ...     ILaunchpadCelebrities)
 
-    >>> obsolete_junk = getUtility(ILaunchpadCelebrities).obsolete_junk
+    >>> obsolete_junk = celebrities.obsolete_junk
     >>> productseries.product == obsolete_junk
     True
     >>> print productseries.name