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

[Edwin Grubbs]

Improved informational message so that it will not say a team was proposed when it was really added due to having an existing invite.

[Brad Crittenden (bac)]

The branch looks good Edwin.

Personally I think:

team_string = team_names[0]

is more readable than:

[team_string] = team_names

review: Approve (code)

=== modified file 'lib/lp/registry/browser/person.py'
--- lib/lp/registry/browser/person.py	2010-06-30 01:39:11 +0000
+++ lib/lp/registry/browser/person.py	2010-07-08 15:12:48 +0000
@@ -4201,6 +4201,10 @@
         context = self.context
         is_admin = check_permission('launchpad.Admin', context)
         membership_set = getUtility(ITeamMembershipSet)
+        proposed_team_names = []
+        added_team_names = []
+        accepted_invite_team_names = []
+        membership_set = getUtility(ITeamMembershipSet)
         for team in data['teams']:
             membership = membership_set.getByPersonAndTeam(team, context)
             if (membership is not None
@@ -4209,21 +4213,39 @@
                     context,
                     'Accepted an already pending invitation while trying to '
                     'propose the team for membership.')
+                accepted_invite_team_names.append(team.displayname)
             elif is_admin:
                 context.addMember(team, reviewer=self.user)
+                added_team_names.append(team.displayname)
             else:
                 team.join(context, requester=self.user)
-        if (context.subscriptionpolicy == TeamSubscriptionPolicy.MODERATED
-            and not is_admin):
-            msg = 'proposed to this team.'
-        else:
-            msg = 'added to this team.'
-        if len(data['teams']) > 1:
-            msg = "have been %s" % msg
-        else:
-            msg = "has been %s" % msg
-        team_names = ', '.join(team.displayname for team in data['teams'])
-        self.request.response.addInfoNotification("%s %s" % (team_names, msg))
+                membership = membership_set.getByPersonAndTeam(team, context)
+                if membership.status == TeamMembershipStatus.PROPOSED:
+                    proposed_team_names.append(team.displayname)
+                elif membership.status == TeamMembershipStatus.APPROVED:
+                    added_team_names.append(team.displayname)
+                else:
+                    raise AssertionError(
+                        'Unexpected membership status (%s) for %s.'
+                        % (membership.status.name, team.name))
+        full_message = ''
+        for team_names, message in (
+            (proposed_team_names, 'proposed to this team.'),
+            (added_team_names, 'added to this team.'),
+            (accepted_invite_team_names,
+             'added to this team because of an existing invite.'),
+            ):
+            if len(team_names) == 0:
+                continue
+            elif len(team_names) == 1:
+                verb = 'has been'
+                team_string = team_names[0]
+            elif len(team_names) > 1:
+                verb = 'have been'
+                team_string= (
+                    ', '.join(team_names[:-1]) + ' and ' + team_names[-1])
+            full_message += '%s %s %s ' % (team_string, verb, message)
+        self.request.response.addInfoNotification(full_message)
 
 
 class TeamLeaveView(LaunchpadFormView, TeamJoinMixin):
 
=== modified file 'lib/lp/registry/stories/team/xx-team-add-my-teams.txt'
--- lib/lp/registry/stories/team/xx-team-add-my-teams.txt	2010-06-29 18:13:00 +0000
+++ lib/lp/registry/stories/team/xx-team-add-my-teams.txt	2010-07-08 15:12:48 +0000
@@ -62,7 +62,7 @@
     >>> print user_browser.title
     Super Team in Launchpad
     >>> print get_feedback_messages(user_browser.contents)
-    [u'Sub Team has been added to this team.']
+    [u'Sub Team has been added to this team because of an existing invite.']
     >>> print extract_text(
     ...     find_tag_by_id(user_browser.contents, 'recently-approved'))
     Latest members
@@ -146,7 +146,7 @@
     ...     'guadamen', 'ubuntu-security']
     >>> browser.getControl('Continue').click()
     >>> print "\n".join(get_feedback_messages(browser.contents))
-    GuadaMen, Ubuntu Security Team have been added to this team.
+    GuadaMen and Ubuntu Security Team have been added to this team.
 
 And when no teams can be added, a message is displayed: