Commit 845944d9 authored by Jim Fulton's avatar Jim Fulton

Changed isTop to use more explicit protocol. Changed getCopy to use aq_base.

parent dd1794b7
"""Access control package""" """Access control package"""
__version__='$Revision: 1.51 $'[11:-2] __version__='$Revision: 1.52 $'[11:-2]
import Globals, App.Undo, socket, regex import Globals, App.Undo, socket, regex
from PersistentMapping import PersistentMapping from PersistentMapping import PersistentMapping
...@@ -157,10 +157,10 @@ class UserFolder(Implicit, Persistent, Navigation, Tabs, RoleManager, ...@@ -157,10 +157,10 @@ class UserFolder(Implicit, Persistent, Navigation, Tabs, RoleManager,
return len(self.data.keys()) return len(self.data.keys())
def _isTop(self): def _isTop(self):
try: t=self.aq_parent.aq_parent.acl_users try: self=self.aq_parent
except: return 1 except: return 1
return 0 return self.isTopLevelPrincipiaApplicationObject
def user_names(self): def user_names(self):
keys=self.data.keys() keys=self.data.keys()
keys.sort() keys.sort()
...@@ -350,8 +350,8 @@ class UserFolder(Implicit, Persistent, Navigation, Tabs, RoleManager, ...@@ -350,8 +350,8 @@ class UserFolder(Implicit, Persistent, Navigation, Tabs, RoleManager,
# Copy/Paste support # Copy/Paste support
def _getCopy(self, container): def _getCopy(self, container):
try: obj=container.aq_self obj=container
except: obj=container if hasattr(obj, 'aq_base'): obj=obj.aq_base
if hasattr(obj,'acl_users'): if hasattr(obj,'acl_users'):
raise ('Copy Error', raise ('Copy Error',
'<EM>This object already contains a UserFolder</EM>') '<EM>This object already contains a UserFolder</EM>')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment