Merge lp://staging/~wallyworld/launchpad/private-branch-unsubscribe-283167 into lp://staging/launchpad

Proposed by Ian Booth
Status: Merged
Approved by: Graham Binns
Approved revision: no longer in the source branch.
Merged at revision: 13409
Proposed branch: lp://staging/~wallyworld/launchpad/private-branch-unsubscribe-283167
Merge into: lp://staging/launchpad
Diff against target: 87 lines (+33/-13)
3 files modified
lib/lp/code/model/tests/test_branchsubscription.py (+27/-5)
lib/lp/code/security.py (+5/-3)
lib/lp/testing/factory.py (+1/-5)
To merge this branch: bzr merge lp://staging/~wallyworld/launchpad/private-branch-unsubscribe-283167
Reviewer Review Type Date Requested Status
Graham Binns (community) code Approve
Review via email: mp+67651@code.staging.launchpad.net

Commit message

[r=gmb][bug=283167] Branch owners can edit any subscriptions to the branch.

Description of the change

== Implementation ==

The bug report says that owners of private branches should be able to edit subscriptions to the branch. This mp does that, but for public branches too.

If the branch owner is a team, then the team owner can edit the subscriptions, but an arbitrary member of the owning team cannot.

== Tests ==

Added new tests to TestBranchSubscriptionCanBeUnsubscribedbyUser:
  test_branch_person_owner_can_unsubscribe
  test_branch_team_owner_can_unsubscribe

== Lint ==
Checking for conflicts and issues in changed files.

Linting changed files:
  lib/lp/code/security.py
  lib/lp/code/model/tests/test_branchsubscription.py
  lib/lp/testing/factory.py

To post a comment you must log in.
Revision history for this message
Graham Binns (gmb) wrote :

Hi Ian,

Only one very minor comment, otherwise r=me.

[1]

36 +

Minor nit, I know, but this blank line shouldn't be here.

review: Approve (code)
Revision history for this message
Robert Collins (lifeless) wrote :

The team ownership thing is inconsistent with every other use of teams; why do it that way?

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.