[Erp5-report] r35537 jerome - /erp5/trunk/products/ERP5Type/Core/Folder.py

[nobody at svn.erp5.org]

Author: jerome
Date: Fri May 21 16:06:08 2010
New Revision: 35537

URL: http://svn.erp5.org?rev=35537&view=rev
Log:
if some portal_type are passed to contentValues, don't filter this list of
portal_type to remove non existing types

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

Modified: erp5/trunk/products/ERP5Type/Core/Folder.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Core/Folder.py?rev=35537&r1=35536&r2=35537&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Core/Folder.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/Core/Folder.py [utf8] Fri May 21 16:06:08 2010
@@ -1431,17 +1431,16 @@
   def contentValues(self, *args, **kw):
     # Returns a list of documents contained in this folder.
     # ( no docstring to prevent publishing )
-    portal_type_id_list = self._getTypesTool().listContentTypes()
     filter_kw = kw.pop('filter', None) or {}
     portal_type = kw.pop('portal_type', None)
     if 'portal_type' in filter_kw:
       portal_type = filter_kw.pop('portal_type')
     if portal_type is None:
-      kw['portal_type'] = portal_type_id_list
+      kw['portal_type'] = self._getTypesTool().listContentTypes()
     else:
       if isinstance(portal_type, str):
         portal_type = portal_type,
-      kw['portal_type'] = [x for x in portal_type if x in portal_type_id_list]
+      kw['portal_type'] = portal_type
     object_list = self.objectValues(*args, **kw)
     if filter_kw:
       object_list = filter(ContentFilter(**filter_kw), object_list)