launchpad-reviewers team mailing list archive

[Steve Kowalik <stevenk@xxxxxxxxxx>]

Steve Kowalik has proposed merging lp:~stevenk/launchpad/stop-lying-please into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #1049487 in Launchpad itself: "Changing a team owner assumes that it's the previous owner doing it"
  https://bugs.launchpad.net/launchpad/+bug/1049487

For more details, see:
https://code.launchpad.net/~stevenk/launchpad/stop-lying-please/+merge/165000

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.
-- 
https://code.launchpad.net/~stevenk/launchpad/stop-lying-please/+merge/165000
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~stevenk/launchpad/stop-lying-please into lp:launchpad.

=== modified file 'lib/lp/bugs/browser/structuralsubscription.py'
--- lib/lp/bugs/browser/structuralsubscription.py	2012-09-17 16:13:40 +0000
+++ lib/lp/bugs/browser/structuralsubscription.py	2013-05-22 02:15:53 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009-2012 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2013 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 __metaclass__ = type
@@ -244,13 +244,13 @@
             self.request.response.addNotification(
                 'You have subscribed to "%s". You will now receive an '
                 'e-mail each time someone reports or changes one of '
-                'its public bugs.' % target.displayname)
+                'its bugs.' % target.displayname)
         elif is_subscribed and not subscribe:
             target.removeBugSubscription(self.user, self.user)
             self.request.response.addNotification(
                 'You have unsubscribed from "%s". You '
                 'will no longer automatically receive e-mail about '
-                'changes to its public bugs.'
+                'changes to its bugs.'
                 % target.displayname)
         else:
             # The subscription status did not change: nothing to do.

=== modified file 'lib/lp/registry/browser/team.py'
--- lib/lp/registry/browser/team.py	2013-04-10 08:09:05 +0000
+++ lib/lp/registry/browser/team.py	2013-05-22 02:15:53 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009-2012 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2013 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 __metaclass__ = type
@@ -2098,11 +2098,11 @@
         # proposed members they'll be made administrators of the team.
         if newOwner not in team.inactivemembers:
             team.addMember(
-                newOwner, reviewer=oldOwner,
+                newOwner, reviewer=self.user,
                 status=TeamMembershipStatus.ADMIN, force_team_add=True)
         if oldOwner not in team.inactivemembers:
             team.addMember(
-                oldOwner, reviewer=oldOwner,
+                oldOwner, reviewer=self.user,
                 status=TeamMembershipStatus.ADMIN, force_team_add=True)
 
         # If the current logged in user cannot see the team anymore as a