Changed to use *both* class-defined and inherited permissions.

Changed to use both class-defined and inherited permissions.
ee336960 · Jim Fulton · 096f5f8d · ee336960
Commit ee336960 authored May 03, 1999 by Jim Fulton
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

lib/python/ZClasses/Basic.py lib/python/ZClasses/Basic.py +4 -2

No files found.
--- a/lib/python/ZClasses/Basic.py
+++ b/lib/python/ZClasses/Basic.py
@@ -248,13 +248,15 @@ class ZClassPermissionsSheet(OFS.PropertySheets.PropertySheet,
    def manage_add(self, REQUEST, newPermission=''):
        "Remove some permissions"
        perms=self.classDefinedPermissions()
+        aperms=perms+self.classInheritedPermissions()
        changed=0
        message=[]
        newPermission=strip(newPermission)
        if newPermission:
-            if newPermission in perms:
+            if newPermission in aperms:
-                message.append('The new permission, %s, is already in use' % s)
+                message.append('The new permission, %s, is already in use'
+                               % newPermission)
            else:
                perms.append(newPermission)
                changed=1