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

[nobody at svn.erp5.org]

Author: alex
Date: Thu May 11 13:26:18 2006
New Revision: 7194

URL: http://svn.erp5.org?rev=7194&view=rev
Log:
fixed contentValues:
- do not keep the filter inside the filter.
- prevent exception when filter is None.

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=7194&r1=7193&r2=7194&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Document/Folder.py (original)
+++ erp5/trunk/products/ERP5Type/Document/Folder.py Thu May 11 13:26:18 2006
@@ -750,7 +750,8 @@
       spec = meta_type
     if portal_type is not None:
       kw['portal_type'] = portal_type
-    kw.update(kw.get('filter', {}))
+    filter = kw.pop('filter', {}) or {}
+    kw.update(filter)
     object_list = CMFBTreeFolder.contentValues(self, spec=spec, filter=kw)
     object_list = sortValueList(object_list, sort_on, sort_order, **kw)
     return object_list