← Back to team overview

launchpad-reviewers team mailing list archive

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

 

Steve Kowalik has proposed merging lp:~stevenk/launchpad/less-celebrites-bug-security into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~stevenk/launchpad/less-celebrites-bug-security/+merge/94313

user is already a role, so we don't need to drag celebrities in.
-- 
https://code.launchpad.net/~stevenk/launchpad/less-celebrites-bug-security/+merge/94313
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~stevenk/launchpad/less-celebrites-bug-security into lp:launchpad.
=== modified file 'lib/lp/bugs/security.py'
--- lib/lp/bugs/security.py	2012-02-22 05:33:48 +0000
+++ lib/lp/bugs/security.py	2012-02-23 05:18:19 +0000
@@ -6,9 +6,6 @@
 __metaclass__ = type
 __all__ = []
 
-from zope.component import getUtility
-
-from lp.app.interfaces.launchpad import ILaunchpadCelebrities
 from lp.app.security import (
     AnonymousAuthorization,
     AuthorizationBase,
@@ -69,7 +66,7 @@
             return False
 
         # Admins can always delete bugtasks.
-        if user.inTeam(getUtility(ILaunchpadCelebrities).admin):
+        if user.in_admin:
             return True
 
         bugtask = self.obj
@@ -233,8 +230,7 @@
 
     def checkAuthenticated(self, user):
         return (
-            user.in_admin or
-            user.in_launchpad_developers)
+            user.in_admin or user.in_launchpad_developers)
 
 
 class EditStructuralSubscription(AuthorizationBase):