[Erp5-report] r42928 arnaud.fontaine - /erp5/trunk/products/ERP5PropertySheetLegacy/Propert...
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Feb 2 13:44:03 CET 2011
Author: arnaud.fontaine
Date: Wed Feb 2 13:44:03 2011
New Revision: 42928
URL: http://svn.erp5.org?rev=42928&view=rev
Log:
* constraint_portal_type for ZODB CategoryExistenceConstraint and
CategoryMembershipArityConstraint should have always been a string
to allow defining a TALES Expression as already used in filesystem
Property Sheets.
* Add use_acquisition attribute to allow merging CategoryAcquiredExistenceConstraint
into CategoryExistenceConstraint, and CategoryAcquiredMembershipArityConstraint into
CategoryMembershipArityConstraint.
Modified:
erp5/trunk/products/ERP5PropertySheetLegacy/PropertySheet/CategoryExistenceConstraint.py
erp5/trunk/products/ERP5PropertySheetLegacy/PropertySheet/CategoryMembershipArityConstraint.py
Modified: erp5/trunk/products/ERP5PropertySheetLegacy/PropertySheet/CategoryExistenceConstraint.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5PropertySheetLegacy/PropertySheet/CategoryExistenceConstraint.py?rev=42928&r1=42927&r2=42928&view=diff
==============================================================================
--- erp5/trunk/products/ERP5PropertySheetLegacy/PropertySheet/CategoryExistenceConstraint.py [utf8] (original)
+++ erp5/trunk/products/ERP5PropertySheetLegacy/PropertySheet/CategoryExistenceConstraint.py [utf8] Wed Feb 2 13:44:03 2011
@@ -35,10 +35,14 @@ class CategoryExistenceConstraint:
'type': 'lines',
'description' : 'Categories to check the existence for',
'default': () },
+ # TALES Expression
{ 'id': 'constraint_portal_type',
- 'type': 'lines',
+ 'type': 'string',
'description' : 'Portal types',
- 'default': () },
+ 'default': 'python: ()' },
+ { 'id' : 'use_acquisition',
+ 'type': 'boolean',
+ 'description': 'Use acquisition when checking categories' },
{ 'id': 'message_category_not_set',
'type': 'string',
'description' : 'Error message when the category is not defined',
Modified: erp5/trunk/products/ERP5PropertySheetLegacy/PropertySheet/CategoryMembershipArityConstraint.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5PropertySheetLegacy/PropertySheet/CategoryMembershipArityConstraint.py?rev=42928&r1=42927&r2=42928&view=diff
==============================================================================
--- erp5/trunk/products/ERP5PropertySheetLegacy/PropertySheet/CategoryMembershipArityConstraint.py [utf8] (original)
+++ erp5/trunk/products/ERP5PropertySheetLegacy/PropertySheet/CategoryMembershipArityConstraint.py [utf8] Wed Feb 2 13:44:03 2011
@@ -37,14 +37,18 @@ class CategoryMembershipArityConstraint:
{ 'id': 'max_arity',
'type': 'int',
'description' : 'Maximum arity' },
+ # TALES Expression
{ 'id': 'constraint_portal_type',
- 'type': 'lines',
+ 'type': 'string',
'description' : 'Portal types',
- 'default': () },
+ 'default': 'python: ()' },
{ 'id': 'constraint_base_category',
'type': 'lines',
'description' : 'Base categories',
'default': () },
+ { 'id' : 'use_acquisition',
+ 'type': 'boolean',
+ 'description': 'Use acquisition when checking categories' },
{ 'id': 'message_arity_too_small',
'type': 'string',
'description' : 'Error message when the arity for the relation '\
More information about the Erp5-report
mailing list