[Erp5-report] r43037 arnaud.fontaine - /erp5/trunk/products/ERP5Type/Core/

[nobody at svn.erp5.org]

Author: arnaud.fontaine
Date: Fri Feb  4 12:06:19 2011
New Revision: 43037

URL: http://svn.erp5.org?rev=43037&view=rev
Log:
For Category Existence and Category Membership Arity ZODB Constraints,
'constraint_portal_type' is a TALES expression since r42928 so update
their documents to evaluate the expression when checking the
consistency


Modified:
    erp5/trunk/products/ERP5Type/Core/CategoryExistenceConstraint.py
    erp5/trunk/products/ERP5Type/Core/CategoryMembershipArityConstraint.py

Modified: erp5/trunk/products/ERP5Type/Core/CategoryExistenceConstraint.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Core/CategoryExistenceConstraint.py?rev=43037&r1=43036&r2=43037&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Core/CategoryExistenceConstraint.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/Core/CategoryExistenceConstraint.py [utf8] Fri Feb  4 12:06:19 2011
@@ -69,7 +69,9 @@ class CategoryExistenceConstraint(Constr
     Check the object's consistency.
     """
     error_list = []
-    portal_type_list = self.getConstraintPortalTypeList()
+    portal_type_list = self._getExpressionValue(obj,
+                                                self.getConstraintPortalType())
+
     # For each attribute name, we check if defined
     for base_category in self.getConstraintBaseCategoryList():
       mapping = dict(base_category=base_category)

Modified: erp5/trunk/products/ERP5Type/Core/CategoryMembershipArityConstraint.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Core/CategoryMembershipArityConstraint.py?rev=43037&r1=43036&r2=43037&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Core/CategoryMembershipArityConstraint.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/Core/CategoryMembershipArityConstraint.py [utf8] Fri Feb  4 12:06:19 2011
@@ -77,7 +77,8 @@ class CategoryMembershipArityConstraint(
     base_category_list = self.getConstraintBaseCategoryList()
     min_arity = self.getMinArity()
     max_arity = self.getMaxArity()
-    portal_type_list = self.getConstraintPortalTypeList()
+    portal_type_list = self._getExpressionValue(obj,
+                                                self.getConstraintPortalType())
 
     # Check arity and compare it with the min and max
     arity = self._calculateArity(obj, base_category_list, portal_type_list)