Commit 09ad3f53 authored by Ken Manheimer's avatar Ken Manheimer

New RoleManager._has_user_defined_role().

Put in non-ttw accommodations ('if REQUEST is not None') for ._addRoles()
and ._delRoles().
parent 8eb2b8d3
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
############################################################################## ##############################################################################
"""Access control support""" """Access control support"""
__version__='$Revision: 1.29 $'[11:-2] __version__='$Revision: 1.30 $'[11:-2]
from Globals import HTMLFile, MessageDialog, Dictionary from Globals import HTMLFile, MessageDialog, Dictionary
...@@ -454,9 +454,8 @@ class RoleManager(ExtensionClass.Base): ...@@ -454,9 +454,8 @@ class RoleManager(ExtensionClass.Base):
data=list(self.__ac_roles__) data=list(self.__ac_roles__)
data.append(role) data.append(role)
self.__ac_roles__=tuple(data) self.__ac_roles__=tuple(data)
return self.manage_access(self, REQUEST) if REQUEST is not None:
return self.manage_access(self, REQUEST)
def _delRoles(self, roles, REQUEST): def _delRoles(self, roles, REQUEST):
...@@ -470,8 +469,13 @@ class RoleManager(ExtensionClass.Base): ...@@ -470,8 +469,13 @@ class RoleManager(ExtensionClass.Base):
try: data.remove(role) try: data.remove(role)
except: pass except: pass
self.__ac_roles__=tuple(data) self.__ac_roles__=tuple(data)
return self.manage_access(self, REQUEST) if REQUEST is not None:
return self.manage_access(self, REQUEST)
def _has_user_defined_role(self, role):
return role in self.__ac_roles__
# Compatibility names only!! # Compatibility names only!!
......
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