[Erp5-report] r7145 - /erp5/trunk/products/ERP5Type/Document/Folder.py

[nobody at svn.erp5.org]

Author: jerome
Date: Wed May 10 13:52:59 2006
New Revision: 7145

URL: http://svn.erp5.org?rev=7145&view=rev
Log:
Honor 'filter' keyword argument in contentValues, for compatibility with PortalFolder.contentValues
Don't filter by portal type, it's done by PortalFolder.contentValues


Modified:
    erp5/trunk/products/ERP5Type/Document/Folder.py

Modified: erp5/trunk/products/ERP5Type/Document/Folder.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Document/Folder.py?rev=7145&r1=7144&r2=7145&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Document/Folder.py (original)
+++ erp5/trunk/products/ERP5Type/Document/Folder.py Wed May 10 13:52:59 2006
@@ -721,12 +721,13 @@
         parent.manage_delObjects(from_object.getId())
     return corrected_list
 
-  security.declareProtected( Permissions.AccessContentsInformation, 'objectValues' )
-  def objectValues(self, spec=None, meta_type=None, portal_type=None, sort_on=None, sort_order=None, **kw):
+  security.declareProtected( Permissions.AccessContentsInformation,
+                             'objectValues' )
+  def objectValues(self, spec=None, meta_type=None, portal_type=None,
+                   sort_on=None, sort_order=None, **kw):
     """
     Returns a list containing object contained in this folder.
     """
-    #LOG('objectValues', 0, 'spec = %r, kw = %r' % (spec, kw))
     if meta_type is not None:
       spec = meta_type
     object_list = CMFBTreeFolder.objectValues(self, spec=spec)
@@ -737,21 +738,20 @@
     object_list = sortValueList(object_list, sort_on, sort_order, **kw)
     return object_list
 
-  security.declareProtected( Permissions.AccessContentsInformation, 'contentValues' )
-  def contentValues(self, spec=None, meta_type=None, portal_type=None, sort_on=None, sort_order=None, **kw):
+  security.declareProtected( Permissions.AccessContentsInformation,
+                             'contentValues' )
+  def contentValues(self, spec=None, meta_type=None, portal_type=None,
+                    sort_on=None, sort_order=None, **kw):
     """
     Returns a list containing object contained in this folder.
-    Filter objects with appropriate permissions (as in contentValues
-    """
-    #LOG('contentValues', 0, 'spec = %r, kw = %r' % (spec, kw))
+    Filter objects with appropriate permissions (as in contentValues)
+    """
     if meta_type is not None:
       spec = meta_type
-    if portal_type is not None: kw['portal_type'] = portal_type
-    object_list = CMFBTreeFolder.contentValues(self, spec=spec, filter = kw)
     if portal_type is not None:
-      if type(portal_type) == type(''):
-        portal_type = (portal_type,)
-      object_list = filter(lambda x: x.getPortalType() in portal_type, object_list)
+      kw['portal_type'] = portal_type
+    kw.update(kw.get('filter', {}))
+    object_list = CMFBTreeFolder.contentValues(self, spec=spec, filter=kw)
     object_list = sortValueList(object_list, sort_on, sort_order, **kw)
     return object_list