[Erp5-report] r38329 jerome - /erp5/trunk/products/ERP5/Document/Resource.py

[nobody at svn.erp5.org]

Author: jerome
Date: Tue Sep 14 09:44:14 2010
New Revision: 38329

URL: http://svn.erp5.org?rev=38329&view=rev
Log:
fix supply_path_type and portal_type arguments clash

Modified:
    erp5/trunk/products/ERP5/Document/Resource.py

Modified: erp5/trunk/products/ERP5/Document/Resource.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/Resource.py?rev=38329&r1=38328&r2=38329&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Resource.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/Resource.py [utf8] Tue Sep 14 09:44:14 2010
@@ -682,7 +682,8 @@ class Resource(XMLMatrix, Variated):
       portal = self.getPortalObject()
       domain_tool = getToolByName(portal, 'portal_domains')
       if supply_path_type is None:
-        portal_type_list = portal.getPortalSupplyPathTypeList()
+        portal_type_list = kw.pop('portal_type',
+                                  portal.getPortalSupplyPathTypeList())
       elif isinstance(supply_path_type, (list, tuple)):
         portal_type_list = supply_path_type
       else: