Merge lp:~edwin-grubbs/launchpad/bug-576388-proposing-invited-team into lp:launchpad

[Edwin Grubbs]

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-add-my-teams.txt

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://launchpad.dev/~USERNAME/+expiringmembership/TEAMNAME
  * Click "Cancel".
  * You should be taken to the /~USERNAME overview page.

[Leonard Richardson (leonardr)]

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.

review: Approve

[Edwin Grubbs (edwin-grubbs)]

I made change #1. The comment isn't actually viewable anywhere, so I didn't add a test for it, but maybe it will be helpful when somebody is debugging a team membership problem.

=== modified file 'lib/lp/registry/browser/person.py'
--- lib/lp/registry/browser/person.py	2010-06-28 21:56:49 +0000
+++ lib/lp/registry/browser/person.py	2010-06-30 01:41:29 +0000
@@ -557,9 +557,7 @@
     def next_url(self):
         return canonical_url(self.context.person)
 
-    @property
-    def cancel_url(self):
-        return canonical_url(self.context)
+    cancel_url = next_url
 
     @action(_("Renew"), name="renew")
     def renew_action(self, action, data):
@@ -4202,8 +4200,16 @@
         """Make the selected teams join this team."""
         context = self.context
         is_admin = check_permission('launchpad.Admin', context)
+        membership_set = getUtility(ITeamMembershipSet)
         for team in data['teams']:
-            if is_admin:
+            membership = membership_set.getByPersonAndTeam(team, context)
+            if (membership is not None
+                and membership.status == TeamMembershipStatus.INVITED):
+                team.acceptInvitationToBeMemberOf(
+                    context,
+                    'Accepted an already pending invitation while trying to '
+                    'propose the team for membership.')
+            elif is_admin:
                 context.addMember(team, reviewer=self.user)
             else:
                 team.join(context, requester=self.user)
 
=== modified file 'lib/lp/registry/stories/team/xx-team-add-my-teams.txt'
--- lib/lp/registry/stories/team/xx-team-add-my-teams.txt	2009-12-24 01:38:11 +0000
+++ lib/lp/registry/stories/team/xx-team-add-my-teams.txt	2010-06-30 01:41:29 +0000
@@ -40,6 +40,34 @@
     Pending approval
     Ubuntu Team...
 
+If the team is already invited, the invitation will be accepted instead
+of trying to propose the membership, which is an invalid status change.
+
+    >>> from zope.component import getUtility
+    >>> from lp.registry.interfaces.person import IPersonSet
+    >>> from storm.store import Store
+    >>> login('[e-mail]')
+    >>> inviting_owner = factory.makePerson(email="[e-mail]")
+    >>> login('[e-mail]')
+    >>> no_priv = getUtility(IPersonSet).getByName('no-priv')
+    >>> super_team = factory.makeTeam(name="super-team", owner=inviting_owner)
+    >>> sub_team = factory.makeTeam(name="sub-team", owner=no_priv)
+    >>> print super_team.addMember(sub_team, inviting_owner)
+    (True, <DBItem TeamMembershipStatus.INVITED...)
+    >>> Store.of(sub_team).flush()
+    >>> logout()
+    >>> user_browser.open('http://launchpad.dev/~super-team/+add-my-teams')
+    >>> user_browser.getControl(name='field.teams').value = ['sub-team']
+    >>> user_browser.getControl('Continue').click()
+    >>> print user_browser.title
+    Super Team in Launchpad
+    >>> print get_feedback_messages(user_browser.contents)
+    [u'Sub Team has been added to this team.']
+    >>> print extract_text(
+    ...     find_tag_by_id(user_browser.contents, 'recently-approved'))
+    Latest members
+    Sub Team
+
 If it were an OPEN team, we'd be able to directly add any of our teams as
 members.