Launchpad itself

Merge lp:~stevenk/launchpad/less-celebrites-bug-security into lp:launchpad

  1. less-celebrites-bug-security
  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: 14858
Proposed branch: lp:~stevenk/launchpad/less-celebrites-bug-security
Merge into: lp:launchpad
Diff against target: 32 lines (+2/-6)
1 file modified
lib/lp/bugs/security.py (+2/-6)
To merge this branch: bzr merge lp:~stevenk/launchpad/less-celebrites-bug-security
Reviewer Review Type Date Requested Status
Ian Booth (community) Approve
Review via email: mp+94313@code.launchpad.net

Commit message

[r=wallyworld][no-qa] Stop dragging in celebrities in lp.bugs.security.

Description of the change

user is already a role, so we don't need to drag celebrities in.

To post a comment you must log in.
Revision history for this message
Ian Booth (wallyworld) wrote :

Thanks for fixing my snafu

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/bugs/security.py'
2--- lib/lp/bugs/security.py 2012-02-22 05:33:48 +0000
3+++ lib/lp/bugs/security.py 2012-02-23 05:21:18 +0000
4@@ -6,9 +6,6 @@
5 __metaclass__ = type
6 __all__ = []
7
8-from zope.component import getUtility
9-
10-from lp.app.interfaces.launchpad import ILaunchpadCelebrities
11 from lp.app.security import (
12 AnonymousAuthorization,
13 AuthorizationBase,
14@@ -69,7 +66,7 @@
15 return False
16
17 # Admins can always delete bugtasks.
18- if user.inTeam(getUtility(ILaunchpadCelebrities).admin):
19+ if user.in_admin:
20 return True
21
22 bugtask = self.obj
23@@ -233,8 +230,7 @@
24
25 def checkAuthenticated(self, user):
26 return (
27- user.in_admin or
28- user.in_launchpad_developers)
29+ user.in_admin or user.in_launchpad_developers)
30
31
32 class EditStructuralSubscription(AuthorizationBase):