1
=== modified file 'lib/lp/registry/browser/objectreassignment.py'
2
--- lib/lp/registry/browser/objectreassignment.py	2010-02-16 20:36:48 +0000
3
+++ lib/lp/registry/browser/objectreassignment.py	2010-07-09 01:44:44 +0000
4
@@ -111,13 +111,13 @@
5
111
        if callable(self.callback):
111
        if callable(self.callback):
6
112
            self.callback(self.context, oldOwner, newOwner)
112
            self.callback(self.context, oldOwner, newOwner)
7
113
113
9
114
    def isValidOwner(self, newOwner):
114
    def validateOwner(self, new_owner):
10
115
        """Check whether the new owner is acceptable for the context object.
115
        """Check whether the new owner is acceptable for the context object.
11
116
116
14
117
        If it's not acceptable, return False and assign an error message to
117
        If it's not acceptable, display an error by calling:
15
118
        self.errormessage to inform the user.
118
          self.setFieldError(self.ownerOrMaintainerName, 'some error info')
16
119
        """
119
        """
18
120
        return True
120
        pass
19
121
121
20
122
    def _validate(self, action, data):
122
    def _validate(self, action, data):
21
123
        """Override _validate() method."""
123
        """Override _validate() method."""
22
@@ -179,5 +179,4 @@
23
179
            owner = personset.newTeam(
179
            owner = personset.newTeam(
24
180
                self.user, owner_name, owner_name.capitalize())
180
                self.user, owner_name, owner_name.capitalize())
25
181
181
28
182
        if not self.isValidOwner(owner):
182
        self.validateOwner(owner)
27
183
            self.setFieldError(self.ownerOrMaintainerName, 'Invalid owner.')
29
184
183
30
=== modified file 'lib/lp/registry/browser/person.py'
31
--- lib/lp/registry/browser/person.py	2010-07-08 19:29:05 +0000
32
+++ lib/lp/registry/browser/person.py	2010-07-09 01:44:44 +0000
33
@@ -4780,9 +4780,35 @@
34
4780
    schema = ITeamReassignment
4780
    schema = ITeamReassignment
35
4781
4781
36
4782
    def __init__(self, context, request):
4782
    def __init__(self, context, request):
38
4783
        ObjectReassignmentView.__init__(self, context, request)
4783
        super(TeamReassignmentView, self).__init__(context, request)
39
4784
        self.callback = self._addOwnerAsMember
4784
        self.callback = self._addOwnerAsMember
40
4785
4785
41
4786
    def validateOwner(self, new_owner):
42
4787
        """Display error if the owner is not valid.
43
4788
44
4789
        Called by ObjectReassignmentView.validate().
45
4790
        """
46
4791
        if self.context.inTeam(new_owner):
47
4792
            path = self.context.findPathToTeam(new_owner)
48
4793
            if len(path) == 1:
49
4794
                relationship = 'a direct member'
50
4795
                path_string = ''
51
4796
            else:
52
4797
                relationship = 'an indirect member'
53
4798
                full_path = [self.context] + path
54
4799
                path_string = '(%s)' % '&rArr;'.join(
55
4800
                    team.displayname for team in full_path)
56
4801
            error = structured(
57
4802
                'Circular team memberships are not allowed. '
58
4803
                '%(new)s cannot be the new team owner, since %(context)s '
59
4804
                'is %(relationship)s of %(new)s. '
60
4805
                '<span style="white-space: nowrap">%(path)s</span>'
61
4806
                % dict(new=new_owner.displayname,
62
4807
                        context=self.context.displayname,
63
4808
                        relationship=relationship,
64
4809
                        path=path_string))
65
4810
            self.setFieldError(self.ownerOrMaintainerName, error)
66
4811
67
4786
    @property
4812
    @property
68
4787
    def contextName(self):
4813
    def contextName(self):
69
4788
        return self.context.displayname
4814
        return self.context.displayname
70
4789
4815
71
=== added file 'lib/lp/registry/browser/tests/team-reassignment-view.txt'
72
--- lib/lp/registry/browser/tests/team-reassignment-view.txt	1970-01-01 00:00:00 +0000
73
+++ lib/lp/registry/browser/tests/team-reassignment-view.txt	2010-07-09 01:44:44 +0000
74
@@ -0,0 +1,83 @@
75
1
Team Reassignment
76
2
=================
77
3
78
4
There are many restrictions for setting the owner of a team.
79
5
80
6
81
7
Existing Team Error
82
8
-------------------
83
9
84
10
The ObjectReassignmentView displays radio buttons that give you the
85
11
option to create a team as opposed to using an existing team. If the
86
12
user tries to create a new team with the same name as an existing team,
87
13
an error is displayed.
88
14
89
15
    >>> from lp.registry.interfaces.person import IPersonSet
90
16
    >>> person_set = getUtility(IPersonSet)
91
17
    >>> operator = person_set.getByName('name12')
92
18
    >>> login_person(operator)
93
19
    >>> a_team = factory.makeTeam(
94
20
    ...     owner=operator, name='a-team', displayname='A-Team')
95
21
    >>> b_team = factory.makeTeam(
96
22
    ...     owner=operator, name='b-team', displayname='B-Team')
97
23
    >>> c_team = factory.makeTeam(
98
24
    ...     owner=operator, name='c-team', displayname='C-Team')
99
25
    >>> a_team.addMember(b_team, operator)
100
26
    (True...
101
27
    >>> b_team.addMember(c_team, operator)
102
28
    (True...
103
29
    >>> transaction.commit()
104
30
105
31
    >>> view = create_initialized_view(
106
32
    ...     c_team, '+reassign', principal=operator)
107
33
    >>> print list(w.name for w in view.widgets)
108
34
    ['field.owner', 'field.existing']
109
35
110
36
    >>> form = {
111
37
    ...     'field.owner': 'a-team',
112
38
    ...     'field.existing': 'new',
113
39
    ...     'field.actions.change': 'Change',
114
40
    ...     }
115
41
    >>> view = create_initialized_view(
116
42
    ...     a_team, '+reassign', form=form, principal=operator)
117
43
    >>> print view.errors
118
44
    [u"There's already a person/team with the name 'a-team' in Launchpad.
119
45
    Please choose a different name or select the option to make that
120
46
    person/team the new owner, if that's what you want."]
121
47
122
48
123
49
Cyclical Team Membership Error
124
50
------------------------------
125
51
126
52
When a person or team becomes the owner of another team, they are also
127
53
added as a member. Team memberships cannot be cyclical; therefore, the
128
54
team can't have its owner be a team of which it is a direct or indirect
129
55
member.
130
56
131
57
    >>> form = {
132
58
    ...     'field.owner': 'b-team',
133
59
    ...     'field.existing': 'existing',
134
60
    ...     'field.actions.change': 'Change',
135
61
    ...     }
136
62
    >>> view = create_initialized_view(
137
63
    ...     c_team, '+reassign', form=form, principal=operator)
138
64
    >>> print view.widget_errors
139
65
    {'owner': u'Circular team memberships are not allowed.
140
66
    B-Team cannot be the new team owner, since C-Team is a direct member
141
67
    of B-Team. <...><...>'}
142
68
143
69
If there is an indirect membership between the teams, the path between
144
70
the teams is displayed so that the user has a better idea how to resolve
145
71
the issue.
146
72
147
73
    >>> form = {
148
74
    ...     'field.owner': 'a-team',
149
75
    ...     'field.existing': 'existing',
150
76
    ...     'field.actions.change': 'Change',
151
77
    ...     }
152
78
    >>> view = create_initialized_view(
153
79
    ...     c_team, '+reassign', form=form, principal=operator)
154
80
    >>> print view.widget_errors
155
81
    {'owner': u'Circular team memberships are not allowed.
156
82
    A-Team cannot be the new team owner, since C-Team is an
157
83
    indirect member of A-Team. <...>(C-Team&rArr;B-Team&rArr;A-Team)<...>'}
Reviewer	Review Type	Date Requested	Status
Paul Hummer (community)	code	2010-07-07	Approve on 2010-07-08
Review via email: mp+29407@code.launchpad.net