[Erp5-report] r31280 aurel - /erp5/trunk/products/ERP5/Document/TradeCondition.py

[nobody at svn.erp5.org]

Author: aurel
Date: Mon Dec 14 14:51:50 2009
New Revision: 31280

URL: http://svn.erp5.org?rev=31280&view=rev
Log:
fix findSpecialiseValueList so that now it works with portal_type_list
parameter and an inheritance tree bigger than 3 levels

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

Modified: erp5/trunk/products/ERP5/Document/TradeCondition.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/TradeCondition.py?rev=31280&r1=31279&r2=31280&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/TradeCondition.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/TradeCondition.py [utf8] Mon Dec 14 14:51:50 2009
@@ -130,23 +130,30 @@
         specialise_value_list = context.getSpecialiseValueList()
         visited_trade_condition_list = context.getSpecialiseValueList(\
             portal_type=portal_type_list)
+
       while len(specialise_value_list) != 0:
         specialise = specialise_value_list.pop(0)
         try:
-          child_list = specialise.getSpecialiseValueList(\
+          # all children
+          child_specialised_value_list = specialise.getSpecialiseValueList()
+          # only children that match the portal_type given
+          child_visited_trade_condition_list = specialise.getSpecialiseValueList(\
               portal_type=portal_type_list)
         except AttributeError:
           # it is possible, that specialised object cannot be specialised
           # anymore
           continue
-        intersection = set(child_list).intersection(\
+        intersection = set(child_specialised_value_list).intersection(\
             set(visited_trade_condition_list))
-        for model in child_list:
+        for model in child_specialised_value_list:
+          # don't add model that have already been visited. This permit to
+          # visit all the tree and to prevent having circular dependency
           if model not in intersection:
-            # don't add model that are already been visited. This permit to
-            # visit all model tree, and to not have circular dependency
             specialise_value_list.append(model)
-            visited_trade_condition_list.append(model)
+            # only add those who matches the portal type given
+            if model in child_visited_trade_condition_list:
+              visited_trade_condition_list.append(model)
+
       return visited_trade_condition_list
 
     security.declareProtected(Permissions.AccessContentsInformation,