add membership_criterion_base_category to context, when generating a

predicate.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@5836 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5/Document/Predicate.py

@@ -385,7 +385,9 @@ class Predicate(Folder):
     as a trick to simplify the development of Predicates and forms.
     """
     new_membership_criterion_category_list = list(self.getMembershipCriterionCategoryList())
+    new_membership_criterion_base_category_list = list(self.getMembershipCriterionBaseCategoryList())
     new_multimembership_criterion_base_category_list = list(self.getMultimembershipCriterionBaseCategoryList())
+
     for base_category in multimembership_criterion_base_category_list:
       category_list = self.getProperty(base_category + '_list')
       if category_list is not None and len(category_list)>0:
@@ -393,6 +395,7 @@ class Predicate(Folder):
           new_membership_criterion_category_list.append(base_category + '/' + category)
         if base_category not in new_multimembership_criterion_base_category_list:
           new_multimembership_criterion_base_category_list.append(base_category)
+
     for base_category in membership_criterion_base_category_list:
       category_list = self.getProperty(base_category + '_list')
       if category_list is not None and len(category_list)>0:
@@ -400,6 +403,7 @@ class Predicate(Folder):
           new_membership_criterion_category_list.append(base_category + '/' + category)
         if base_category not in new_membership_criterion_base_category_list:
           new_membership_criterion_base_category_list.append(base_category)
+
     new_criterion_property_list =  list(self.getCriterionPropertyList())
     identity_criterion = getattr(self,'_identity_criterion',{})
     range_criterion = getattr(self,'_range_criterion',{})
@@ -421,6 +425,7 @@ class Predicate(Folder):
     # we have a predicate with local properties
     new_self = self.asContext(
         membership_criterion_category=new_membership_criterion_category_list,
+        membership_criterion_base_category=new_membership_criterion_base_category_list,
         multimembership_criterion_base_category=new_multimembership_criterion_base_category_list,
         criterion_property_list=new_criterion_property_list,
         _identity_criterion=identity_criterion,