Commit d675c96d authored by Jérome Perrin's avatar Jérome Perrin

reset Predicate before fusion method


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@3683 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent b8b0ca01
...@@ -33,12 +33,8 @@ from Acquisition import aq_base, aq_inner ...@@ -33,12 +33,8 @@ from Acquisition import aq_base, aq_inner
from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
from Products.ERP5Type.Document.Folder import Folder from Products.ERP5Type.Document.Folder import Folder
from Products.ERP5Type.Document import newTempBase from Products.ERP5Type.Document import newTempBase
from Products.CMFCore.utils import getToolByName
from Products.ERP5Type.Utils import convertToUpperCase from Products.ERP5Type.Utils import convertToUpperCase
from string import join,replace
from zLOG import LOG from zLOG import LOG
class Predicate(Folder): class Predicate(Folder):
...@@ -71,7 +67,7 @@ class Predicate(Folder): ...@@ -71,7 +67,7 @@ class Predicate(Folder):
# Declarative security # Declarative security
security = ClassSecurityInfo() security = ClassSecurityInfo()
security.declareObjectProtected(Permissions.View) security.declareObjectProtected(Permissions.View)
# Declarative properties # Declarative properties
property_sheets = ( PropertySheet.Base property_sheets = ( PropertySheet.Base
, PropertySheet.Predicate , PropertySheet.Predicate
...@@ -234,6 +230,10 @@ class Predicate(Folder): ...@@ -234,6 +230,10 @@ class Predicate(Folder):
multimembership_criterion_base_category_list = [] multimembership_criterion_base_category_list = []
test_method_id_list = [] test_method_id_list = []
criterion_property_list = [] criterion_property_list = []
# reset criterions
self._identity_criterion = {}
self._range_criterion = {}
for c in category_list: for c in category_list:
bc = c.split('/')[0] bc = c.split('/')[0]
if bc in base_category_id_list: if bc in base_category_id_list:
...@@ -257,7 +257,7 @@ class Predicate(Folder): ...@@ -257,7 +257,7 @@ class Predicate(Folder):
self._setMembershipCriterionCategoryList(membership_criterion_category_list) self._setMembershipCriterionCategoryList(membership_criterion_category_list)
self._setMembershipCriterionBaseCategoryList(membership_criterion_base_category_list) self._setMembershipCriterionBaseCategoryList(membership_criterion_base_category_list)
self._setMultimembershipCriterionBaseCategoryList(multimembership_criterion_base_category_list) self._setMultimembershipCriterionBaseCategoryList(multimembership_criterion_base_category_list)
self._setTestMethodIdList(test_method_id_list) self._setTestMethodIdList(test_method_id_list)
self.reindexObject() self.reindexObject()
def generatePredicate(self,multimembership_criterion_base_category_list=(), def generatePredicate(self,multimembership_criterion_base_category_list=(),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment