Launchpad itself

Merge lp:~stevenk/launchpad/stop-lying-please into lp:launchpad

  1. stop-lying-please
  2. Merge into devel
Proposed by Steve Kowalik
Status: Merged
Approved by: Steve Kowalik
Approved revision: no longer in the source branch.
Merged at revision: 16637
Proposed branch: lp:~stevenk/launchpad/stop-lying-please
Merge into: lp:launchpad
Diff against target: 50 lines (+6/-7)
2 files modified
lib/lp/bugs/browser/structuralsubscription.py (+3/-4)
lib/lp/registry/browser/team.py (+3/-3)
To merge this branch: bzr merge lp:~stevenk/launchpad/stop-lying-please
Reviewer Review Type Date Requested Status
William Grant code Approve
Review via email: mp+165000@code.launchpad.net

Commit message

Fix two small lies in the structural subscription notifications and the team reassignment mail notification.

Description of the change

Fix two small lies in the structural subscription notifications and the team reassignment mail notification.

Structural subscriptions have been filtering bugs for over a year now, so only saying 'public bugs' is wrong and misleading.

No longer spoof the old owner when a team is reassigned.

To post a comment you must log in.
Revision history for this message
William Grant (wgrant) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/bugs/browser/structuralsubscription.py'
2--- lib/lp/bugs/browser/structuralsubscription.py 2012-09-17 16:13:40 +0000
3+++ lib/lp/bugs/browser/structuralsubscription.py 2013-05-22 02:27:28 +0000
4@@ -1,4 +1,4 @@
5-# Copyright 2009-2012 Canonical Ltd. This software is licensed under the
6+# Copyright 2009-2013 Canonical Ltd. This software is licensed under the
7 # GNU Affero General Public License version 3 (see the file LICENSE).
8
9 __metaclass__ = type
10@@ -244,14 +244,13 @@
11 self.request.response.addNotification(
12 'You have subscribed to "%s". You will now receive an '
13 'e-mail each time someone reports or changes one of '
14- 'its public bugs.' % target.displayname)
15+ 'its bugs.' % target.displayname)
16 elif is_subscribed and not subscribe:
17 target.removeBugSubscription(self.user, self.user)
18 self.request.response.addNotification(
19 'You have unsubscribed from "%s". You '
20 'will no longer automatically receive e-mail about '
21- 'changes to its public bugs.'
22- % target.displayname)
23+ 'changes to its bugs.' % target.displayname)
24 else:
25 # The subscription status did not change: nothing to do.
26 pass
27
28=== modified file 'lib/lp/registry/browser/team.py'
29--- lib/lp/registry/browser/team.py 2013-04-10 08:09:05 +0000
30+++ lib/lp/registry/browser/team.py 2013-05-22 02:27:28 +0000
31@@ -1,4 +1,4 @@
32-# Copyright 2009-2012 Canonical Ltd. This software is licensed under the
33+# Copyright 2009-2013 Canonical Ltd. This software is licensed under the
34 # GNU Affero General Public License version 3 (see the file LICENSE).
35
36 __metaclass__ = type
37@@ -2098,11 +2098,11 @@
38 # proposed members they'll be made administrators of the team.
39 if newOwner not in team.inactivemembers:
40 team.addMember(
41- newOwner, reviewer=oldOwner,
42+ newOwner, reviewer=self.user,
43 status=TeamMembershipStatus.ADMIN, force_team_add=True)
44 if oldOwner not in team.inactivemembers:
45 team.addMember(
46- oldOwner, reviewer=oldOwner,
47+ oldOwner, reviewer=self.user,
48 status=TeamMembershipStatus.ADMIN, force_team_add=True)
49
50 # If the current logged in user cannot see the team anymore as a