[Checkins] SVN: z3c.securitytool/trunk/src/z3c/securitytool/ Code
cleanup
Daniel Blackburn
blackburnd at gmail.com
Wed Feb 20 13:43:04 EST 2008
Log message for revision 84084:
Code cleanup
Changed:
U z3c.securitytool/trunk/src/z3c/securitytool/browser/views.py
U z3c.securitytool/trunk/src/z3c/securitytool/securitytool.py
-=-
Modified: z3c.securitytool/trunk/src/z3c/securitytool/browser/views.py
===================================================================
--- z3c.securitytool/trunk/src/z3c/securitytool/browser/views.py 2008-02-20 17:34:59 UTC (rev 84083)
+++ z3c.securitytool/trunk/src/z3c/securitytool/browser/views.py 2008-02-20 18:43:04 UTC (rev 84084)
@@ -148,16 +148,10 @@
pageTemplateFile = "principalinfo.pt"
def update(self):
- if self.request.form.has_key('principal'):
- self.principal = self.request.form['principal']
- else:
- self.principal = 'no principal specified'
-
+ self.principal = self.request.get('principal','no principal specified')
skin = getSkin(self.request) or IBrowserRequest
principal_security = PrincipalDetails(self.context)
- #principal_security = ISecurityChecker(self.context)
-
self.principalPermissions = principal_security(self.principal,
skin=skin)
@@ -168,6 +162,10 @@
self.preparePrincipalPermissions()
def preparePrincipalPermissions(self):
+ """
+ This method just organized the permission and role tree
+ lists to display properly.
+ """
permTree = self.principalPermissions['permissionTree']
for idx, item in enumerate(permTree):
for uid,value in item.items():
Modified: z3c.securitytool/trunk/src/z3c/securitytool/securitytool.py
===================================================================
--- z3c.securitytool/trunk/src/z3c/securitytool/securitytool.py 2008-02-20 17:34:59 UTC (rev 84083)
+++ z3c.securitytool/trunk/src/z3c/securitytool/securitytool.py 2008-02-20 18:43:04 UTC (rev 84084)
@@ -121,7 +121,7 @@
continue
else:
- permSetting = principalRoleProvidesPermission(
+ permSetting = roleProvidesPermission(
principalRoles, rolePermMap,
principal, read_perm,
role['role']
@@ -163,21 +163,16 @@
self.viewPermMatrix[principal] = {self.name: permSetting}
class PermissionDetails(object):
+ """Get permission details for a given principal and view.
+ Includes the permissions set by the groups the principal belongs to.
+ """
+
implements(interfaces.IPermissionDetails)
- #adapts(Interface,IBrowserRequest)
-
def __init__(self,context):
self.context = context
def __call__(self,principal_id,view_name,skin):
- """Get permission details for a given principal and view.
- Includes the permissions set by the groups the principal belongs to.
- """
-
- principals = zapi.principals()
- principal = principals.getPrincipal(principal_id)
-
settings = None
rolePermissions = []
read_perm = 'zope.Public'
@@ -186,11 +181,13 @@
'roles': [],
'groups': {}}
+ principals = zapi.principals()
+ principal = principals.getPrincipal(principal_id)
+
ifaces = tuple(providedBy(self.context))
for iface in ifaces:
for view_reg in getViews(iface, skin):
if view_reg.name == view_name:
-
view = getView(self.context, view_reg, skin)
settings = settingsForObject(view)
read_perm = getViewInfoDictionary(view_reg)['read_perm'] or 'zope.Public'
@@ -229,7 +226,7 @@
principalSettings['permissions'].append(
{'name': renderedName(name), 'setting': permSetting})
- role_id, permSetting = principalRoleProvidesPermission(
+ role_id, permSetting = roleProvidesPermission(
prinRoleMap, rolePermMap, principal.id,read_perm )
if permSetting:
nameList = principalSettings['roles'].setdefault(role_id, [])
@@ -471,7 +468,7 @@
rolePerm['permission'] == permission_id):
return rolePerm['setting'].getName()
-def principalRoleProvidesPermission(prinRoleMap, rolePermMap, principal_id,
+def roleProvidesPermission(prinRoleMap, rolePermMap, principal_id,
permission_id,role=None):
"""Return the role id and permission setting for a given principal and
permission.
@@ -590,7 +587,7 @@
def getSettingsForMatrix(viewInstance):
""" Here we aggregate all the principal permissions into one object
We need them all for our lookups to work properly in
- principalRoleProvidesPermission.
+ roleProvidesPermission.
"""
allSettings = {}
permSetting = ()
More information about the Checkins
mailing list