From 5de9e6a5000c45bc25ce40449dc631c1ed517999 Mon Sep 17 00:00:00 2001 From: Jean-Paul Smets <jp@nexedi.com> Date: Sat, 17 Jul 2004 08:28:17 +0000 Subject: [PATCH] manage criterion_property_list in predicate aggregation git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@1229 20353a03-c40f-0410-a6d1-a30d3c3de9de --- product/ERP5/Document/PredicateGroup.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/product/ERP5/Document/PredicateGroup.py b/product/ERP5/Document/PredicateGroup.py index be19b97346..36dc020395 100755 --- a/product/ERP5/Document/PredicateGroup.py +++ b/product/ERP5/Document/PredicateGroup.py @@ -208,6 +208,7 @@ identify a bank account.""" membership_criterion_category_list = [] membership_criterion_base_category_list = [] multimembership_criterion_base_category_list = [] + criterion_property_list = [] for c in category_list: bc = c.split('/')[0] if bc in base_category_id_list: @@ -217,6 +218,7 @@ identify a bank account.""" else: predicate_value = category_tool.resolveCategory(c) if predicate_value is not None: + criterion_property_list.extend(predicate_value.getCriterionPropertyList()) membership_criterion_category_list.extend( predicate_value.getMembershipCriterionCategoryList()) membership_criterion_base_category_list.extend( @@ -225,6 +227,7 @@ identify a bank account.""" predicate_value.getMultimembershipCriterionBaseCategoryList()) for p in predicate_value.getCriterionList(): self.setCriterion(p.property, identity=p.identity, min=p.min, max=p.max) + self._setCriterionPropertyList(criterion_property_list) self._setMembershipCriterionCategoryList(membership_criterion_category_list) self._setMembershipCriterionBaseCategoryList(membership_criterion_base_category_list) self._setMultimembershipCriterionBaseCategoryList(multimembership_criterion_base_category_list) -- 2.30.9