[Checkins] SVN: z3c.securitytool/trunk/src/z3c/securitytool/ Fixed
issue with principaldetails and directly provided permisisons
not displaying properly
Daniel Blackburn
blackburnd at gmail.com
Mon Feb 4 09:30:40 EST 2008
Log message for revision 83498:
Fixed issue with principaldetails and directly provided permisisons not displaying properly
Changed:
U z3c.securitytool/trunk/src/z3c/securitytool/browser/principalinfo.pt
U z3c.securitytool/trunk/src/z3c/securitytool/browser/views.py
U z3c.securitytool/trunk/src/z3c/securitytool/concordTimesPrincipals.zcml
U z3c.securitytool/trunk/src/z3c/securitytool/securitytool.py
-=-
Modified: z3c.securitytool/trunk/src/z3c/securitytool/browser/principalinfo.pt
===================================================================
--- z3c.securitytool/trunk/src/z3c/securitytool/browser/principalinfo.pt 2008-02-04 14:12:27 UTC (rev 83497)
+++ z3c.securitytool/trunk/src/z3c/securitytool/browser/principalinfo.pt 2008-02-04 14:30:39 UTC (rev 83498)
@@ -25,12 +25,20 @@
roles view/principalPermissions/roles;
groups view/principalPermissions/groups">
- <tal:block tal:condition="permissions">
- <h3>Directly provided permissions</h3>
- <div tal:repeat="permission permissions">
- <span tal:replace="permission">zope.ManageSite</span>
- </div>
- </tal:block>
+ <h3 tal:condition="permissions"> Directly provided permissions</h3>
+ <div class="contentList" tal:repeat="permissionItem permissions" >
+ <tal:block tal:repeat="permission permissionItem">
+ <ul>
+ <li>
+ <span tal:content="permission/permission"/>
+ <span tal:attributes="class permission/setting"
+ tal:content="permission/setting"/>
+ </li>
+ </ul>
+ </tal:block>
+ </div>
+ <br tal:condition="permissions">
+
<h3 tal:condition="roles">Permissions provided by roles</h3>
<div class="contentList" tal:condition="roles">
<div tal:repeat="role roles">
@@ -38,8 +46,8 @@
<div tal:repeat="permission python:roles[role]">
<ul>
<li>
- <div tal:content="permission/permission"/>
- <div tal:attributes="class permission/setting"
+ <span tal:content="permission/permission"/>
+ <span tal:attributes="class permission/setting"
tal:content="permission/setting"/>
</li>
</ul>
Modified: z3c.securitytool/trunk/src/z3c/securitytool/browser/views.py
===================================================================
--- z3c.securitytool/trunk/src/z3c/securitytool/browser/views.py 2008-02-04 14:12:27 UTC (rev 83497)
+++ z3c.securitytool/trunk/src/z3c/securitytool/browser/views.py 2008-02-04 14:30:39 UTC (rev 83498)
@@ -116,10 +116,6 @@
skin = getSkin(self.request) or IBrowserRequest
- self.legend = (u"<span class='Deny'>Red Bold = Denied Permission"
- u"</span>,<span class='Allow'> Green Normal = "
- u"Allowed Permission </span>")
-
principal_security = ISecurityChecker(self.context)
self.principalPermissions = principal_security.principalPermissions(
self.principal, skin=skin)
Modified: z3c.securitytool/trunk/src/z3c/securitytool/concordTimesPrincipals.zcml
===================================================================
--- z3c.securitytool/trunk/src/z3c/securitytool/concordTimesPrincipals.zcml 2008-02-04 14:12:27 UTC (rev 83497)
+++ z3c.securitytool/trunk/src/z3c/securitytool/concordTimesPrincipals.zcml 2008-02-04 14:30:39 UTC (rev 83498)
@@ -5,37 +5,37 @@
<permission
id="concord.CreateArticle"
- title="View Perm."
+ title="Create Concord-Times Article"
description="A Permission Used to View Issues"
/>
<permission
id="concord.DeleteArticle"
- title="Del Article Perm."
+ title="Delete Concord-Times Article"
description="A Permission Used to Delete Articles"
/>
<permission
id="concord.CreateIssue"
- title="View Perm."
+ title="Create Concord-Times Issue"
description="A Permission Used to Create Issues"
/>
<permission
id="concord.DeleteIssue"
- title="View Perm."
+ title="Delete Concord-Times Issue"
description="A Permission Used to Delete Issues"
/>
<permission
id="concord.ReadIssue"
- title="View Perm."
+ title="Read Concord-Times Issue"
description="A Permission Used to View Issues"
/>
<permission
id="concord.PublishIssue"
- title="View Perm."
+ title="Publish Concord-Times Issue"
description="A Permission Used to Publish Issues"
/>
Modified: z3c.securitytool/trunk/src/z3c/securitytool/securitytool.py
===================================================================
--- z3c.securitytool/trunk/src/z3c/securitytool/securitytool.py 2008-02-04 14:12:27 UTC (rev 83497)
+++ z3c.securitytool/trunk/src/z3c/securitytool/securitytool.py 2008-02-04 14:30:39 UTC (rev 83498)
@@ -129,7 +129,6 @@
else:
self.viewMatrix[principal] = {self.name: permSetting}
-
def principalPermissions(self, principal_id, skin=IBrowserRequest):
"""Return all security settings (permissions, groups, roles)
for all interfaces provided by this context for a
@@ -158,7 +157,11 @@
all_settings)
if PrinSettings['permissions']:
- prinPermSettings['permissions'].append(PrinSettings['permissions'])
+ if PrinSettings['permissions'] not in \
+ prinPermSettings['permissions']:
+ prinPermSettings['permissions'].append(
+ PrinSettings['permissions'])
+
if PrinSettings['roles']:
prinPermSettings['roles'].update(PrinSettings['roles'])
if PrinSettings['groups']:
More information about the Checkins
mailing list