Commit 92b51eee authored by Julien Muchembled's avatar Julien Muchembled

Fix contentValues of ERP5 Category Tool

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@30213 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent bfc1db8d
...@@ -56,6 +56,8 @@ class CategoryTool(CopyContainer, CMFCategoryTool, BaseTool): ...@@ -56,6 +56,8 @@ class CategoryTool(CopyContainer, CMFCategoryTool, BaseTool):
# Declarative Security # Declarative Security
security = ClassSecurityInfo() security = ClassSecurityInfo()
objectValues = BaseTool.objectValues
# Filter content (ZMI)) # Filter content (ZMI))
def filtered_meta_types(self, user=None): def filtered_meta_types(self, user=None):
# Filters the list of available meta types. # Filters the list of available meta types.
......
...@@ -1407,10 +1407,7 @@ class Folder(CopyContainer, CMFBTreeFolder, CMFHBTreeFolder, Base, FolderMixIn, ...@@ -1407,10 +1407,7 @@ class Folder(CopyContainer, CMFBTreeFolder, CMFHBTreeFolder, Base, FolderMixIn,
else: else:
object_list = CMFHBTreeFolder.objectValues(self) object_list = CMFHBTreeFolder.objectValues(self)
else: else:
if self._tree is None: object_list = CMFBTreeFolder.objectValues(self, spec=spec)
object_list = []
else:
object_list = CMFBTreeFolder.objectValues(self, spec=spec)
if portal_type is not None: if portal_type is not None:
if type(portal_type) == type(''): if type(portal_type) == type(''):
portal_type = (portal_type,) portal_type = (portal_type,)
......
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