[Zope3-checkins] CVS: Zope3/src/zope/app/browser/security/grants - configure.zcml:1.1.2.3 rolepermissionview.py:1.1.2.3

[Jim Fulton]

Update of /cvs-repository/Zope3/src/zope/app/browser/security/grants
In directory cvs.zope.org:/tmp/cvs-serv9989/src/zope/app/browser/security/grants

Modified Files:
      Tag: NameGeddon-branch
	configure.zcml rolepermissionview.py 
Log Message:
Gor zope running again! 

I haven't tested everything. 
(Yes, we need functional tests. Maybe this week).

Good enough to merge into trunk.



=== Zope3/src/zope/app/browser/security/grants/configure.zcml 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/browser/security/grants/configure.zcml:1.1.2.2	Tue Dec 24 07:50:51 2002
+++ Zope3/src/zope/app/browser/security/grants/configure.zcml	Wed Dec 25 08:27:24 2002
@@ -3,11 +3,12 @@
    xmlns:browser='http://namespaces.zope.org/browser'
 >
 
-<!-- Role-Permission management view -->
+<!-- Role Permissions -->
 
-  <browser:view for="zope.app.interfaces.annotation.IAnnotatable"
-                permission="zope.Security"
-                factory="zope.app.browser.security.grants.rolepermissionview.RolePermissionView">
+  <browser:view
+      for="zope.app.interfaces.annotation.IAnnotatable"
+      permission="zope.Security"
+      factory=".rolepermissionview.RolePermissionView">
 
     <browser:page name="AllRolePermissions.html"
                   attribute="index" />
@@ -23,28 +24,41 @@
                   attribute="update_permission" />
   </browser:view>
 
+  <browser:menuItem
+      for="zope.app.interfaces.annotation.IAnnotatable"
+      menu="zmi_views"
+      title="Role Permissions"
+      action="@@AllRolePermissions.html"
+      />
+
+<!-- Principal Roles -->
 
   <browser:view for="zope.app.interfaces.annotation.IAnnotatable"
                 permission="zope.Security"
-                factory="zope.app.browser.security.grants.principalroleview.PrincipalRoleView">
+                factory=".principalroleview.PrincipalRoleView">
     <browser:page name="PrincipalRoles.html"
                   attribute="index" />
     <browser:page name="ChangePrincipalRoles.html"
                   attribute="action" />
-  </browser:view>
+    </browser:view>
 
+  <browser:menuItem
+      for="zope.app.interfaces.annotation.IAnnotatable"
+      menu="zmi_views"
+      title="Principal Role"
+      action="PrincipalRoles.html"
+      />
 
-  <content class="zope.app.browser.security.grants.principalpermissionview.PrincipalPermissionView">
-    <require
-        permission="zope.Security"
-        attributes="index get_principal unsetPermissions denyPermissions
-                    grantPermissions getUnsetPermissionsForPrincipal
-                    getPermissionsForPrincipal" />
-  </content>
+<!-- Principal Permission (not working) -->
 
-  <browser:view
+  <!-- browser:view
       name="PrincipalPermissionsManagement"
       for="zope.app.interfaces.annotation.IAnnotatable"
-      factory="zope.app.browser.security.grants.principalpermissionview.PrincipalPermissionView" />
+      factory=".principalpermissionview.PrincipalPermissionView" 
+      permission="zope.Security"
+      allow_attributes="index get_principal unsetPermissions denyPermissions
+                        grantPermissions getUnsetPermissionsForPrincipal
+                        getPermissionsForPrincipal" 
+      /  -->
 
 </zopeConfigure>


=== Zope3/src/zope/app/browser/security/grants/rolepermissionview.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/browser/security/grants/rolepermissionview.py:1.1.2.2	Tue Dec 24 02:25:24 2002
+++ Zope3/src/zope/app/browser/security/grants/rolepermissionview.py	Wed Dec 25 08:27:24 2002
@@ -29,8 +29,8 @@
 class RolePermissionView(BrowserView):
 
     index = ViewPageTemplateFile('manage_access.pt')
-    manage_permissionForm = ViewPageTemplateFile('manage_permissionForm.pt')
-    manage_roleForm = ViewPageTemplateFile('manage_roleForm.pt')
+    manage_permissionForm = ViewPageTemplateFile('manage_permissionform.pt')
+    manage_roleForm = ViewPageTemplateFile('manage_roleform.pt')
 
     def roles(self):
         roles = getattr(self, '_roles', None)