[Erp5-report] r16912 - /erp5/trunk/products/ERP5Form/PlanningBox.py

[nobody at svn.erp5.org]

Author: rafael
Date: Tue Oct  9 16:32:40 2007
New Revision: 16912

URL: http://svn.erp5.org?rev=16912&view=rev
Log:

Fixed an inconsistency when use parent, this fix simplify a litle bit the configuration at field.


Modified:
    erp5/trunk/products/ERP5Form/PlanningBox.py

Modified: erp5/trunk/products/ERP5Form/PlanningBox.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Form/PlanningBox.py?rev=16912&r1=16911&r2=16912&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/PlanningBox.py (original)
+++ erp5/trunk/products/ERP5Form/PlanningBox.py Tue Oct  9 16:32:40 2007
@@ -1352,10 +1352,16 @@
           category_obj = domain_obj.getMembershipCriterionCategory()
           for bc in domain_obj.getMembershipCriterionBaseCategoryList():
             if (category_obj is not None) and (bc is not None):
-              new_object_list.extend([ s_obj for s_obj in build_object_list \
-                   if s_obj._getDefaultAcquiredCategoryMembership(bc) == category_obj])
-              sec_new_object_list.extend([ s_obj for s_obj in build_sec_layer_object_list \
-                   if s_obj._getDefaultAcquiredCategoryMembership(bc) == category_obj])
+              if bc == 'parent':
+                new_object_list.extend([ s_obj for s_obj in build_object_list \
+                    if s_obj.getParentRelativeUrl() == category_obj])
+                sec_new_object_list.extend([ s_obj for s_obj in build_sec_layer_object_list \
+                    if s_obj.getParentRelativeUrl() == category_obj])
+              else:
+                new_object_list.extend([ s_obj for s_obj in build_object_list \
+                  if s_obj._getDefaultAcquiredCategoryMembership(bc) == category_obj])
+                sec_new_object_list.extend([ s_obj for s_obj in build_sec_layer_object_list \
+                  if s_obj._getDefaultAcquiredCategoryMembership(bc) == category_obj])
 
           object_list = new_object_list
           sec_layer_object_list = sec_new_object_list