1
=== modified file 'lib/lp/registry/model/teammembership.py'
2
--- lib/lp/registry/model/teammembership.py	2010-07-16 14:58:17 +0000
3
+++ lib/lp/registry/model/teammembership.py	2010-08-17 16:33:03 +0000
4
@@ -11,7 +11,6 @@
5
11
    ]
11
    ]
6
12
12
7
13
from datetime import datetime, timedelta
13
from datetime import datetime, timedelta
8
14
import itertools
9
15
import pytz
14
import pytz
10
16
15
11
17
from storm.locals import Store
16
from storm.locals import Store
12
@@ -167,8 +166,10 @@
13
167
            simple_sendmail(from_addr, address, subject, msg)
166
            simple_sendmail(from_addr, address, subject, msg)
14
168
167
15
169
    def canChangeStatusSilently(self, user):
168
    def canChangeStatusSilently(self, user):
18
170
        """Ensure that the user is in the Launchpad Administrators group before
169
        """Ensure that the user is in the Launchpad Administrators group.
19
171
           silently making changes to their membership status."""
170
20
171
        Then the user can silently make changes to their membership status.
21
172
        """
22
172
        return user.inTeam(getUtility(ILaunchpadCelebrities).admin)
173
        return user.inTeam(getUtility(ILaunchpadCelebrities).admin)
23
173
174
24
174
    def canChangeExpirationDate(self, person):
175
    def canChangeExpirationDate(self, person):
25
@@ -288,8 +289,8 @@
26
288
289
27
289
        if silent and not self.canChangeStatusSilently(user):
290
        if silent and not self.canChangeStatusSilently(user):
28
290
            raise UserCannotChangeMembershipSilently(
291
            raise UserCannotChangeMembershipSilently(
31
291
                "Only Launchpad administrators may change membership statuses "
292
                "Only Launchpad administrators may change membership "
32
292
                "silently.")
293
                "statuses silently.")
33
293
294
34
294
        approved = TeamMembershipStatus.APPROVED
295
        approved = TeamMembershipStatus.APPROVED
35
295
        admin = TeamMembershipStatus.ADMIN
296
        admin = TeamMembershipStatus.ADMIN
36
@@ -536,7 +537,7 @@
37
536
        conditions = [
537
        conditions = [
38
537
            TeamMembership.dateexpires <= when,
538
            TeamMembership.dateexpires <= when,
39
538
            TeamMembership.status.is_in(
539
            TeamMembership.status.is_in(
41
539
                [TeamMembershipStatus.ADMIN, TeamMembershipStatus.APPROVED])
540
                [TeamMembershipStatus.ADMIN, TeamMembershipStatus.APPROVED]),
42
540
            ]
541
            ]
43
541
        if exclude_autorenewals:
542
        if exclude_autorenewals:
44
542
            # Avoid circular import.
543
            # Avoid circular import.
45
@@ -718,20 +719,48 @@
46
718
    return Store.of(person).find(Person, "id IN (%s)" % query)
719
    return Store.of(person).find(Person, "id IN (%s)" % query)
47
719
720
48
720
721
50
721
def _fillTeamParticipation(member, team):
722
def _fillTeamParticipation(member, accepting_team):
51
722
    """Add relevant entries in TeamParticipation for given member and team.
723
    """Add relevant entries in TeamParticipation for given member and team.
52
723
724
53
724
    Add a tuple "member, team" in TeamParticipation for the given team and all
725
    Add a tuple "member, team" in TeamParticipation for the given team and all
54
725
    of its superteams. More information on how to use the TeamParticipation
726
    of its superteams. More information on how to use the TeamParticipation
55
726
    table can be found in the TeamParticipationUsage spec.
727
    table can be found in the TeamParticipationUsage spec.
56
727
    """
728
    """
57
728
    members = [member]
58
729
    if member.isTeam():
729
    if member.isTeam():
62
730
        # The given member is, in fact, a team, and in this case we must
730
        # The submembers will be all the members of the team that is
63
731
        # add all of its members to the given team and to its superteams.
731
        # being added as a member. The superteams will be all the teams
64
732
        members.extend(member.allmembers)
732
        # that the accepting_team belongs to, so all the members will
65
733
        # also be joining the superteams indirectly. It is important to
66
734
        # remember that teams are members of themselves, so the member
67
735
        # team will also be one of the submembers, and the
68
736
        # accepting_team will also be one of the superteams.
69
737
        query = """
70
738
            INSERT INTO TeamParticipation (person, team)
71
739
            SELECT submember.person, superteam.team
72
740
            FROM TeamParticipation submember
73
741
                JOIN TeamParticipation superteam ON TRUE
74
742
            WHERE submember.team = %(member)d
75
743
                AND superteam.person = %(accepting_team)d
76
744
                AND NOT EXISTS (
77
745
                    SELECT 1
78
746
                    FROM TeamParticipation
79
747
                    WHERE person = submember.person
80
748
                        AND team = superteam.team
81
749
                    )
82
750
            """ % dict(member=member.id, accepting_team=accepting_team.id)
83
751
    else:
84
752
        query = """
85
753
            INSERT INTO TeamParticipation (person, team)
86
754
            SELECT %(member)d, superteam.team
87
755
            FROM TeamParticipation superteam
88
756
            WHERE superteam.person = %(accepting_team)d
89
757
                AND NOT EXISTS (
90
758
                    SELECT 1
91
759
                    FROM TeamParticipation
92
760
                    WHERE person = %(member)d
93
761
                        AND team = superteam.team
94
762
                    )
95
763
            """ % dict(member=member.id, accepting_team=accepting_team.id)
96
733
764
101
734
    for m in members:
765
    store = Store.of(member)
102
735
        for t in itertools.chain(team.super_teams, [team]):
766
    store.execute(query)
99
736
            if not m.hasParticipationEntryFor(t):
100
737
                TeamParticipation(person=m, team=t)
Reviewer	Review Type	Date Requested	Status
Māris Fogels (community)		2010-08-17	Approve on 2010-08-17
Review via email: mp+32895@code.launchpad.net