Merge lp:~brian-murray/launchpad/bug-supervisor-permissions into lp:launchpad

[Brian Murray]

Allow a distribution's bug supervisor to set source package bug reporting guidelines and acknowledgment.

This branch grants the distribution bug supervisor the ability to edit distribution source package's +edit page. This allows them to set the package's bug reporting guidelines and bug reporting acknowledgment.

A test for this was added to test_edit_permissions.py.

bin/test -cvvt test_edit_permissions

[Māris Fogels (mars)]

This is a great change. The test helpers make the change very clean and readable. r=mars

One suggestion for readability: consider renaming self.target and setupTarget() to something like self.context and setupViewContext(). I had to open the base class docstring to understand what the 'target' created by setupTarget actually is.

Maris

review: Approve

=== modified file 'lib/canonical/launchpad/security.py'
--- lib/canonical/launchpad/security.py	2010-09-14 18:28:53 +0000
+++ lib/canonical/launchpad/security.py	2010-10-07 16:52:48 +0000
@@ -893,7 +893,8 @@
     usedfor = IDistributionSourcePackage
 
     def checkAuthenticated(self, user):
-        return (user.inTeam(self.obj.distribution.owner) or
+        return (user.inTeam(self.obj.distribution.bug_supervisor) or
+                user.inTeam(self.obj.distribution.owner) or
                 user.in_admin)
 
 

=== modified file 'lib/lp/bugs/model/bugtarget.py'
--- lib/lp/bugs/model/bugtarget.py	2010-09-21 09:37:06 +0000
+++ lib/lp/bugs/model/bugtarget.py	2010-10-07 16:52:48 +0000
@@ -332,7 +332,7 @@
 class OfficialBugTagTargetMixin:
     """See `IOfficialBugTagTarget`.
 
-    This class is inteneded to be used as a mixin for the classes
+    This class is intended to be used as a mixin for the classes
     Distribution, Product and ProjectGroup, which can define official
     bug tags.
 

=== modified file 'lib/lp/registry/browser/tests/test_edit_permissions.py'
--- lib/lp/registry/browser/tests/test_edit_permissions.py	2010-08-20 20:31:18 +0000
+++ lib/lp/registry/browser/tests/test_edit_permissions.py	2010-10-07 16:52:48 +0000
@@ -75,23 +75,48 @@
 
 
 class ProductEditViewPermissionTestCase(EditViewPermissionBase):
-    """Tests for permissions to access prodcut +edit page."""
+    """Tests for permissions to access product +edit page."""
     def setupTarget(self):
         self.target = self.factory.makeProduct()
 
 
 class ProjectEditViewPermissionTestCase(EditViewPermissionBase):
-    """Tests for permissions to access prodcut +edit page."""
+    """Tests for permissions to access product +edit page."""
     def setupTarget(self):
         self.target = self.factory.makeProject()
 
 
 class DistributionEditViewPermissionTestCase(EditViewPermissionBase):
-    """Tests for permissions to access prodcut +edit page."""
+    """Tests for permissions to access product +edit page."""
     def setupTarget(self):
         self.target = self.factory.makeDistribution()
 
 
+class DistroSourcePackageEditViewPermissionTestCase(EditViewPermissionBase):
+    """Test for permissions to access a distribution source package
+       +edit page."""
+
+    def setupTarget(self):
+        self.d_owner = self.factory.makePerson()
+        login_person(self.d_owner)
+        self.distro = self.factory.makeDistribution(name='youbuntu',
+                                                    owner=self.d_owner)
+        self.target = self.factory.makeDistributionSourcePackage(
+            distribution=self.distro)
+        self.supervisor_team = self.factory.makeTeam(
+            owner=self.d_owner)
+        self.supervisor_member = self.factory.makePerson()
+        self.supervisor_team.addMember(
+            self.supervisor_member, self.d_owner)
+        self.distro.setBugSupervisor(
+            self.supervisor_team, self.d_owner)
+
+    def test_bug_supervisor_can_edit(self):
+        login_person(self.supervisor_member)
+        view = create_initialized_view(self.target, '+edit')
+        self.assertTrue(check_permission('launchpad.Edit', view))
+
+
 def test_suite():
     suite = unittest.TestSuite()
     suite.addTest(unittest.TestLoader().loadTestsFromName(__name__))