Merge lp:~abentley/launchpad/team-transition-error into lp:launchpad
Status: | Merged |
---|---|
Approved by: | Curtis Hovey |
Approved revision: | no longer in the source branch. |
Merged at revision: | 13816 |
Proposed branch: | lp:~abentley/launchpad/team-transition-error |
Merge into: | lp:launchpad |
Diff against target: |
233 lines (+100/-12) 4 files modified
lib/lp/registry/browser/tests/test_team.py (+18/-1) lib/lp/registry/model/person.py (+18/-3) lib/lp/registry/model/teammembership.py (+1/-1) lib/lp/registry/tests/test_teammembership.py (+63/-7) |
To merge this branch: | bzr merge lp:~abentley/launchpad/team-transition-error |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Curtis Hovey (community) | code | Approve | |
Review via email: mp+73103@code.launchpad.net |
Commit message
Fix TeamMembershipT
Description of the change
= Summary =
Fix bug #820077: TeamMembershipT
== Proposed fix ==
Bless transition from DECLINED to INVITED
== Pre-implementation notes ==
Discussed with sinzui
== Implementation details ==
As well as fixing the particular error, I've tested that TeamMemberAddVi
This meant turning PROPOSED to APPROVED if the reviewer was the an admin of the team, instead of changing it to INVITED.
It also meant preventing addMember from downgrading APPROVED/ADMIN to PROPOSED. And while I was there, I prevented downgrading ADMIN to APPROVED.
== Tests ==
bin/test -t test_no_
== Demo and Q/A ==
Create team A and team B with different owners. As the owner of team A, attempt to join team B. As the owner of team B, decline the membership. As the owner of team B, attempt to add team A as a member. This should not OOPS.
= Launchpad lint =
Checking for conflicts and issues in changed files.
Linting changed files:
lib/lp/
lib/lp/
lib/lp/
lib/lp/
As we discussed on IRC, this branch also fixes bug 480157.