Commit db4fe828 authored by Paul Everitt's avatar Paul Everitt

if REQUEST is None added

parent cc620222
"""Folder object """Folder object
$Id: Folder.py,v 1.20 1997/11/21 15:49:48 jim Exp $""" $Id: Folder.py,v 1.21 1997/11/26 23:46:59 paul Exp $"""
__version__='$Revision: 1.20 $'[11:-2] __version__='$Revision: 1.21 $'[11:-2]
from Globals import HTMLFile from Globals import HTMLFile
...@@ -40,7 +40,8 @@ class FolderHandler: ...@@ -40,7 +40,8 @@ class FolderHandler:
i.title=title i.title=title
i._setRoles(acl_type,acl_roles) i._setRoles(acl_type,acl_roles)
self._setObject(id,i) self._setObject(id,i)
return self.manage_main(self,REQUEST) if REQUEST is not None:
return self.manage_main(self,REQUEST)
def folderIds(self): def folderIds(self):
t=[] t=[]
......
__doc__="""Object Manager __doc__="""Object Manager
$Id: ObjectManager.py,v 1.20 1997/11/18 14:10:50 jim Exp $""" $Id: ObjectManager.py,v 1.21 1997/11/26 23:47:00 paul Exp $"""
__version__='$Revision: 1.20 $'[11:-2] __version__='$Revision: 1.21 $'[11:-2]
from SingleThreadedTransaction import Persistent from SingleThreadedTransaction import Persistent
...@@ -295,7 +295,8 @@ class ObjectManager(Acquirer,Management,Persistent): ...@@ -295,7 +295,8 @@ class ObjectManager(Acquirer,Management,Persistent):
try: self._delObject(ids[-1]) try: self._delObject(ids[-1])
except: raise 'BadRequest', ('%s does not exist' % ids[-1]) except: raise 'BadRequest', ('%s does not exist' % ids[-1])
del ids[-1] del ids[-1]
return self.manage_main(self, REQUEST) if REQUEST is not None:
return self.manage_main(self, REQUEST)
def _setProperty(self,id,value,type='string'): def _setProperty(self,id,value,type='string'):
self._checkId(id) self._checkId(id)
...@@ -328,12 +329,13 @@ class ObjectManager(Acquirer,Management,Persistent): ...@@ -328,12 +329,13 @@ class ObjectManager(Acquirer,Management,Persistent):
except: return v except: return v
return filter(lambda x,r=n: x['id'] not in r, v) return filter(lambda x,r=n: x['id'] not in r, v)
def manage_addProperty(self,id,value,type,REQUEST): def manage_addProperty(self,id,value,type,REQUEST=None):
"""Add a new property (www)""" """Add a new property (www)"""
try: value=type_converters[type](value) try: value=type_converters[type](value)
except: pass except: pass
self._setProperty(id,value,type) self._setProperty(id,value,type)
return self.manage_propertiesForm(self,REQUEST) if REQUEST is not None:
return self.manage_propertiesForm(self,REQUEST)
def manage_editProperties(self,REQUEST): def manage_editProperties(self,REQUEST):
"""Edit object properties""" """Edit object properties"""
...@@ -451,6 +453,9 @@ class ObjectManager(Acquirer,Management,Persistent): ...@@ -451,6 +453,9 @@ class ObjectManager(Acquirer,Management,Persistent):
############################################################################## ##############################################################################
# #
# $Log: ObjectManager.py,v $ # $Log: ObjectManager.py,v $
# Revision 1.21 1997/11/26 23:47:00 paul
# if REQUEST is None added
#
# Revision 1.20 1997/11/18 14:10:50 jim # Revision 1.20 1997/11/18 14:10:50 jim
# Fixed a bug in handling 'tokens' properties and got rid of regex # Fixed a bug in handling 'tokens' properties and got rid of regex
# properties. # properties.
......
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