Merge lp:~thumper/launchpad/branch-push-permission into lp:launchpad

[Tim Penhey]

Use launchpad.Edit to determine on the branch-index.pt template whether the user can upload to the branch.

[Tim Penhey (thumper)]

Change the code that controls the "bzr push" display on the branch page to use the launchpad.Edit permission rather than checking ownership of the branch.

[Michael Hudson-Doyle (mwhudson)]

Maybe a test for whether an admin can upload would make sense?

Otherwise, nice.

review: Approve

=== modified file 'lib/lp/code/browser/branch.py'
--- lib/lp/code/browser/branch.py	2010-02-01 03:49:23 +0000
+++ lib/lp/code/browser/branch.py	2010-02-22 01:15:27 +0000
@@ -425,11 +425,13 @@
         linkdata = BranchContextMenu(self.context).edit()
         return '%s/%s' % (canonical_url(self.context), linkdata.target)
 
+    @property
     def user_can_upload(self):
         """Whether the user can upload to this branch."""
-        return (self.user is not None and
-                self.user.inTeam(self.context.owner) and
-                self.context.branch_type == BranchType.HOSTED)
+        branch = self.context
+        if branch.branch_type != BranchType.HOSTED:
+            return False
+        return check_permission('launchpad.Edit', branch)
 
     def user_can_download(self):
         """Whether the user can download this branch."""

=== modified file 'lib/lp/code/browser/tests/test_branch.py'
--- lib/lp/code/browser/tests/test_branch.py	2010-01-07 11:54:06 +0000
+++ lib/lp/code/browser/tests/test_branch.py	2010-02-22 01:15:27 +0000
@@ -33,6 +33,7 @@
 from lp.code.interfaces.branchlookup import IBranchLookup
 from lp.testing import (
     login, login_person, logout, ANONYMOUS, TestCaseWithFactory)
+from lp.testing.views import create_initialized_view
 from canonical.launchpad.webapp.servers import LaunchpadTestRequest
 from canonical.testing import (
     DatabaseFunctionalLayer, LaunchpadFunctionalLayer)
@@ -232,6 +233,34 @@
         view.initialize()
         self.assertEqual(list(view.translations_sources()), [trunk])
 
+    def test_user_can_upload(self):
+        # A user can upload if they have edit permissions.
+        branch = self.factory.makeAnyBranch()
+        view = create_initialized_view(branch, '+index')
+        login_person(branch.owner)
+        self.assertTrue(view.user_can_upload)
+
+    def test_user_can_upload_admins_can(self):
+        # Admins can upload to any hosted branch.
+        branch = self.factory.makeAnyBranch()
+        view = create_initialized_view(branch, '+index')
+        login('[e-mail]')
+        self.assertTrue(view.user_can_upload)
+
+    def test_user_can_upload_non_owner(self):
+        # Someone not associated with the branch cannot upload
+        branch = self.factory.makeAnyBranch()
+        view = create_initialized_view(branch, '+index')
+        login_person(self.factory.makePerson())
+        self.assertFalse(view.user_can_upload)
+
+    def test_user_can_upload_mirrored(self):
+        # Even the owner of a mirrored branch can't upload.
+        branch = self.factory.makeAnyBranch(branch_type=BranchType.MIRRORED)
+        view = create_initialized_view(branch, '+index')
+        login_person(branch.owner)
+        self.assertFalse(view.user_can_upload)
+
 
 class TestBranchAddView(TestCaseWithFactory):
     """Test the BranchAddView view."""