Merge lp:~edwin-grubbs/launchpad/bug-576388-proposing-invited-team into lp:launchpad
Status: | Merged |
---|---|
Approved by: | Edwin Grubbs |
Approved revision: | no longer in the source branch. |
Merged at revision: | 11080 |
Proposed branch: | lp:~edwin-grubbs/launchpad/bug-576388-proposing-invited-team |
Merge into: | lp:launchpad |
Diff against target: |
70 lines (+38/-4) 2 files modified
lib/lp/registry/browser/person.py (+10/-4) lib/lp/registry/stories/team/xx-team-add-my-teams.txt (+28/-0) |
To merge this branch: | bzr merge lp:~edwin-grubbs/launchpad/bug-576388-proposing-invited-team |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Leonard Richardson (community) | Approve | ||
Review via email: mp+28786@code.launchpad.net |
Description of the change
Summary
-------
This branch fixes bug 517439 and bug 576388.
For bug 517439, the "Renew" button appears to have been fixed already, but
the "Cancel" link still had the problem where it would redirect the user
to the membership index page, which is only viewable by team admins.
For bug 576388, when the user submits the form, it checks whether he
is trying to propose a team that is already invited. If that is the
case, the invitation is accepted.
Tests
-----
./bin/test -vv -t xx-team-
Demo and Q/A
------------
Test accepting an invitation on the +add-my-teams page:
* Create team "foo" owned by foo-owner.
* Create team "bar" owned by bar-owner.
* User foo-owner should add bar as a member. It will show up in the
"Latest invited" list on foo's index page.
* User bar-owner should go to foo's index page and click on
the "Add one of my teams" link, then select the "bar" radio
button, and click the "Continue" button.
* The foo index page should now show bar in the "Latest members"
list and not the "Pending approval" list.
Test "Cancel" button on +expiringmembership page:
* Create a team that allows members to renew their own membership.
* Add a member.
* You will need the membership to expire within 7 days. This can be
done by clicking on the "All members" link and then clicking on the
edit link next to the member you want to renew.
* Open http://
* Click "Cancel".
* You should be taken to the /~USERNAME overview page.
1. 'Accepted invitation whilst trying to propose the team' is awkward. Rephrase to something like "Accepted an already pending invitation while trying to propose the team for membership."
2. The "Accepted an already pending invitation" string isn't tested. Would it be difficult to show where that string is used (I'm guessing in an email)? If it's very difficult to test, I think it's not a big deal.
r=me with those changes.