Author: romain
Date: Mon Nov 19 17:57:06 2007
New Revision: 17688
URL: http://svn.erp5.org?rev=17688&view=rev
Log:
Fix wrong revision 17666. There shouldn't be acquisition when getAcquisitionPortalTypeList returns an empty list.
Modified:
erp5/trunk/products/CMFCategory/CategoryTool.py
Modified: erp5/trunk/products/CMFCategory/CategoryTool.py
URL: http://svn.erp5.org/erp5/trunk/products/CMFCategory/CategoryTool.py?rev=17688&r1=17687&r2=17688&view=diff
==============================================================================
--- erp5/trunk/products/CMFCategory/CategoryTool.py (original)
+++ erp5/trunk/products/CMFCategory/CategoryTool.py Mon Nov 19 17:57:06 2007
@@ -971,7 +971,7 @@
acquisition_base_category_list = base_category_value.getAcquisitionBaseCategoryList()
alt_base_category_list = base_category_value.getFallbackBaseCategoryList()
all_acquisition_base_category_list = acquisition_base_category_list + alt_base_category_list
- acquisition_pt = base_category_value.getAcquisitionPortalTypeList('python: []')
+ acquisition_pt = base_category_value.getAcquisitionPortalTypeList(None)
for my_base_category in acquisition_base_category_list:
# We implement here special keywords
if my_base_category == 'parent':
@@ -984,7 +984,7 @@
#LOG("Parent Object List ",0,str(acquisition_pt))
#my_acquisition_object_path = parent.getPhysicalPath()
#if my_acquisition_object_path in acquired_object_dict:
- if acquisition_pt == [] or parent.portal_type in acquisition_pt:
+ if acquisition_pt is None or parent.portal_type in acquisition_pt:
my_acquisition_object_list = [parent]
else:
my_acquisition_object_list = []