From 80fe55752ae0a0997a6c68a913e693fcf81e2262 Mon Sep 17 00:00:00 2001
From: Nicolas Delaby <nicolas@nexedi.com>
Date: Thu, 30 Apr 2009 15:36:13 +0000
Subject: [PATCH] Improve Constraint, no need to call portal_catalog. Thanks to
jerome
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@26753 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../ERP5Type/Constraint/AttributeBlacklisted.py | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/product/ERP5Type/Constraint/AttributeBlacklisted.py b/product/ERP5Type/Constraint/AttributeBlacklisted.py
index d2761bb351..09a3b188fc 100644
--- a/product/ERP5Type/Constraint/AttributeBlacklisted.py
+++ b/product/ERP5Type/Constraint/AttributeBlacklisted.py
@@ -37,7 +37,7 @@ class AttributeBlacklisted(PropertyExistence):
{ 'id' : 'title',
'description' : 'Title should not belong to blacklist words',
'type' : 'AttributeBlacklisted',
- 'title' : "python: {'portal_type': object.getPortalType(), 'title': ('Foo', 'Bar',)}",
+ 'title' : "python: ('Foo', 'Bar',)",
'condition' : 'object/getTitle',
},
"""
@@ -50,22 +50,21 @@ class AttributeBlacklisted(PropertyExistence):
def checkConsistency(self, obj, fixit=0):
"""Check the object's consistency.
We will make sure that each non None constraint_definition is
- satisfied (unicity)
- This Constraint use portal_catalog
+ satisfied
"""
if not self._checkConstraintCondition(obj):
return []
errors = PropertyExistence.checkConsistency(self, obj, fixit=fixit)
- for attribute_name, expression_criterion_dict in self.constraint_definition.items():
+ for attribute_name, expression_blaklisted_list in self.constraint_definition.items():
message_id = None
mapping = dict(attribute_name=attribute_name)
#Evaluate expression_criterion_dict
- expression = Expression(expression_criterion_dict)
+ expression = Expression(expression_blaklisted_list)
from Products.ERP5Type.Utils import createExpressionContext
econtext = createExpressionContext(obj)
- criterion_dict = expression(econtext)
- result = obj.portal_catalog.countResults(**criterion_dict)[0][0]
- if result:
+ blaklisted_list = expression(econtext)
+ value = obj.getProperty(attribute_name)
+ if value in blaklisted_list:
message_id = 'message_invalid_attribute_blacklisted'
# Generate error
if message_id is not None:
--
2.30.9