diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Category%20Acquired%20Membership%20Arity%20Constraint/predicate.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Category%20Acquired%20Membership%20Arity%20Constraint/predicate.xml deleted file mode 100644 index 784dbba036d46d802380d27799f0f40557e8620b..0000000000000000000000000000000000000000 --- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Category%20Acquired%20Membership%20Arity%20Constraint/predicate.xml +++ /dev/null @@ -1,124 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_local_properties</string> </key> - <value> - <tuple> - <dictionary> - <item> - <key> <string>id</string> </key> - <value> <string>is_indexable</string> </value> - </item> - <item> - <key> <string>type</string> </key> - <value> <string>string</string> </value> - </item> - </dictionary> - <dictionary> - <item> - <key> <string>id</string> </key> - <value> <string>reindex_kw</string> </value> - </item> - <item> - <key> <string>type</string> </key> - <value> <string>string</string> </value> - </item> - </dictionary> - </tuple> - </value> - </item> - <item> - <key> <string>action</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> - </item> - <item> - <key> <string>categories</string> </key> - <value> - <tuple> - <string>action_type/object_view</string> - </tuple> - </value> - </item> - <item> - <key> <string>category</string> </key> - <value> <string>object_view</string> </value> - </item> - <item> - <key> <string>condition</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>description</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>icon</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>predicate</string> </value> - </item> - <item> - <key> <string>is_indexable</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>permissions</string> </key> - <value> - <tuple> - <string>View</string> - </tuple> - </value> - </item> - <item> - <key> <string>portal_type</string> </key> - <value> <string>Action Information</string> </value> - </item> - <item> - <key> <string>priority</string> </key> - <value> <float>2.0</float> </value> - </item> - <item> - <key> <string>reindex_kw</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string>Predicate</string> </value> - </item> - <item> - <key> <string>visible</string> </key> - <value> <int>1</int> </value> - </item> - </dictionary> - </pickle> - </record> - <record id="2" aka="AAAAAAAAAAI="> - <pickle> - <global name="Expression" module="Products.CMFCore.Expression"/> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>text</string> </key> - <value> <string>string:${object_url}/Predicate_view</string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Category%20Acquired%20Membership%20Arity%20Constraint/view.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Category%20Acquired%20Membership%20Arity%20Constraint/view.xml deleted file mode 100644 index cfa8174b7041e58e0523aaaa26309f36923ab77d..0000000000000000000000000000000000000000 --- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Category%20Acquired%20Membership%20Arity%20Constraint/view.xml +++ /dev/null @@ -1,124 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_local_properties</string> </key> - <value> - <tuple> - <dictionary> - <item> - <key> <string>id</string> </key> - <value> <string>is_indexable</string> </value> - </item> - <item> - <key> <string>type</string> </key> - <value> <string>string</string> </value> - </item> - </dictionary> - <dictionary> - <item> - <key> <string>id</string> </key> - <value> <string>reindex_kw</string> </value> - </item> - <item> - <key> <string>type</string> </key> - <value> <string>string</string> </value> - </item> - </dictionary> - </tuple> - </value> - </item> - <item> - <key> <string>action</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> - </item> - <item> - <key> <string>categories</string> </key> - <value> - <tuple> - <string>action_type/object_view</string> - </tuple> - </value> - </item> - <item> - <key> <string>category</string> </key> - <value> <string>object_view</string> </value> - </item> - <item> - <key> <string>condition</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>description</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>icon</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>view</string> </value> - </item> - <item> - <key> <string>is_indexable</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>permissions</string> </key> - <value> - <tuple> - <string>View</string> - </tuple> - </value> - </item> - <item> - <key> <string>portal_type</string> </key> - <value> <string>Action Information</string> </value> - </item> - <item> - <key> <string>priority</string> </key> - <value> <float>1.0</float> </value> - </item> - <item> - <key> <string>reindex_kw</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string>View</string> </value> - </item> - <item> - <key> <string>visible</string> </key> - <value> <int>1</int> </value> - </item> - </dictionary> - </pickle> - </record> - <record id="2" aka="AAAAAAAAAAI="> - <pickle> - <global name="Expression" module="Products.CMFCore.Expression"/> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>text</string> </key> - <value> <string>string:${object_url}/CategoryMembershipArityConstraint_view</string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/product/ERP5/bootstrap/erp5_core/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml index f40bd2a1e07592de38f9c45859a069cc72fa1aac..2ef37a20252e50a05816128d0028aeb1297677e7 100644 --- a/product/ERP5/bootstrap/erp5_core/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml +++ b/product/ERP5/bootstrap/erp5_core/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml @@ -1,4 +1,7 @@ <allowed_content_type_list> + <portal_type id="Activity Tool"> + <item>Active Process</item> + </portal_type> <portal_type id="Alarm Tool"> <item>Alarm</item> </portal_type> @@ -56,7 +59,6 @@ <item>Accounting Transaction Balance Constraint</item> <item>Acquired Property</item> <item>Attribute Equality Constraint</item> - <item>Category Acquired Membership Arity Constraint</item> <item>Category Existence Constraint</item> <item>Category Membership Arity Constraint</item> <item>Category Property</item> diff --git a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Category%20Acquired%20Membership%20Arity%20Constraint.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Category%20Acquired%20Membership%20Arity%20Constraint.xml deleted file mode 100644 index edf540dee7308aa561be65aabce9fdd5bddd779d..0000000000000000000000000000000000000000 --- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Category%20Acquired%20Membership%20Arity%20Constraint.xml +++ /dev/null @@ -1,111 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <global name="Base Type" module="erp5.portal_type"/> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_property_domain_dict</string> </key> - <value> - <dictionary> - <item> - <key> <string>short_title</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> - </item> - <item> - <key> <string>title</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> - </value> - </item> - </dictionary> - </value> - </item> - <item> - <key> <string>content_icon</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>description</string> </key> - <value> <string>A Category Acquired Membership Arity Constraint checks whether an object respects the arity with Acquisition</string> </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>Category Acquired Membership Arity Constraint</string> </value> - </item> - <item> - <key> <string>init_script</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>permission</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>portal_type</string> </key> - <value> <string>Base Type</string> </value> - </item> - <item> - <key> <string>type_class</string> </key> - <value> <string>CategoryAcquiredMembershipArityConstraint</string> </value> - </item> - <item> - <key> <string>type_interface</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>type_mixin</string> </key> - <value> - <tuple/> - </value> - </item> - </dictionary> - </pickle> - </record> - <record id="2" aka="AAAAAAAAAAI="> - <pickle> - <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>domain_name</string> </key> - <value> <string>erp5_content</string> </value> - </item> - <item> - <key> <string>property_name</string> </key> - <value> <string>short_title</string> </value> - </item> - </dictionary> - </pickle> - </record> - <record id="3" aka="AAAAAAAAAAM="> - <pickle> - <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>domain_name</string> </key> - <value> <string>erp5_content</string> </value> - </item> - <item> - <key> <string>property_name</string> </key> - <value> <string>title</string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Category%20Existence%20Constraint.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Category%20Existence%20Constraint.xml index 6d5fc8aadee4971bf151266c18de2494faa16847..5acd12bc6276bf87717ce1953516b1df7ededea0 100644 --- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Category%20Existence%20Constraint.xml +++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Category%20Existence%20Constraint.xml @@ -33,7 +33,7 @@ </item> <item> <key> <string>description</string> </key> - <value> <string>A Category Existence Constraint checks whether an object contains the given categories</string> </value> + <value> <string>A Category Existence Constraint checks whether an object contains the given categories without or with Acquisition</string> </value> </item> <item> <key> <string>factory</string> </key> diff --git a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Category%20Membership%20Arity%20Constraint.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Category%20Membership%20Arity%20Constraint.xml index e9782820a46a8df7dd5f36bb1bf1f5bffd1e4810..7d6460a634b65b24f7a8046f4f63e700e0633ac5 100644 --- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Category%20Membership%20Arity%20Constraint.xml +++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Category%20Membership%20Arity%20Constraint.xml @@ -33,7 +33,7 @@ </item> <item> <key> <string>description</string> </key> - <value> <string>A Category Membership Arity Constraint checks whether an object respects the arity</string> </value> + <value> <string>A Category Membership Arity Constraint checks whether an object respects the arity without or with Acquisition</string> </value> </item> <item> <key> <string>id</string> </key> diff --git a/product/ERP5/bootstrap/erp5_core/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml index 5adcc0d75da2f4b63f563a4ca24955bfa0e365c5..d92434564d45c9c8574b22a6705618d63ef0e243 100644 --- a/product/ERP5/bootstrap/erp5_core/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml +++ b/product/ERP5/bootstrap/erp5_core/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml @@ -31,10 +31,6 @@ <type>Category</type> <workflow>edit_workflow</workflow> </chain> - <chain> - <type>Category Acquired Membership Arity Constraint</type> - <workflow>dynamic_class_generation_interaction_workflow</workflow> - </chain> <chain> <type>Category Existence Constraint</type> <workflow>dynamic_class_generation_interaction_workflow</workflow> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryExistenceConstraint_view.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryExistenceConstraint_view.xml index 0dba406f30887778942a27720a205d71a3cfd36b..ea8495be9b436aa669f2070cc20803450ad1ccea 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryExistenceConstraint_view.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryExistenceConstraint_view.xml @@ -98,7 +98,8 @@ <string>my_id</string> <string>my_reference</string> <string>my_constraint_base_category_list</string> - <string>my_constraint_portal_type_list</string> + <string>my_constraint_portal_type</string> + <string>my_use_acquisition</string> </list> </value> </item> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryRelatedMembershipArityConstraint_view/my_constraint_portal_type_list.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryExistenceConstraint_view/my_constraint_portal_type.xml similarity index 89% rename from product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryRelatedMembershipArityConstraint_view/my_constraint_portal_type_list.xml rename to product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryExistenceConstraint_view/my_constraint_portal_type.xml index d03f36ad7ed699f93950e80faf507665858f704e..81be612b367bf1d0e92a5c3617858b1c481da66d 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryRelatedMembershipArityConstraint_view/my_constraint_portal_type_list.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryExistenceConstraint_view/my_constraint_portal_type.xml @@ -10,14 +10,14 @@ <key> <string>delegated_list</string> </key> <value> <list> + <string>display_width</string> <string>title</string> - <string>view_separator</string> </list> </value> </item> <item> <key> <string>id</string> </key> - <value> <string>my_constraint_portal_type_list</string> </value> + <value> <string>my_constraint_portal_type</string> </value> </item> <item> <key> <string>message_values</string> </key> @@ -72,9 +72,13 @@ <key> <string>values</string> </key> <value> <dictionary> + <item> + <key> <string>display_width</string> </key> + <value> <int>20</int> </value> + </item> <item> <key> <string>field_id</string> </key> - <value> <string>my_lines_field</string> </value> + <value> <string>my_string_field</string> </value> </item> <item> <key> <string>form_id</string> </key> @@ -88,15 +92,6 @@ <key> <string>title</string> </key> <value> <string>Constraint Portal Types</string> </value> </item> - <item> - <key> <string>view_separator</string> </key> - <value> <string encoding="cdata"><![CDATA[ - -<br />\n - - -]]></string> </value> - </item> </dictionary> </value> </item> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryExistenceConstraint_view/my_use_acquisition.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryExistenceConstraint_view/my_use_acquisition.xml new file mode 100644 index 0000000000000000000000000000000000000000..3e051d64e327d4c848c2521218669934d13b071c --- /dev/null +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryExistenceConstraint_view/my_use_acquisition.xml @@ -0,0 +1,101 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <global name="ProxyField" module="Products.ERP5Form.ProxyField"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>delegated_list</string> </key> + <value> + <list> + <string>description</string> + <string>title</string> + </list> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>my_use_acquisition</string> </value> + </item> + <item> + <key> <string>message_values</string> </key> + <value> + <dictionary> + <item> + <key> <string>external_validator_failed</string> </key> + <value> <string>The input failed the external validator.</string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>overrides</string> </key> + <value> + <dictionary> + <item> + <key> <string>field_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>target</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>tales</string> </key> + <value> + <dictionary> + <item> + <key> <string>field_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>target</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>values</string> </key> + <value> + <dictionary> + <item> + <key> <string>description</string> </key> + <value> <string>Check category existence acquisition</string> </value> + </item> + <item> + <key> <string>field_id</string> </key> + <value> <string>my_checkbox</string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string>Base_viewFieldLibrary</string> </value> + </item> + <item> + <key> <string>target</string> </key> + <value> <string>Click to edit the target</string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Use acquisition</string> </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryMembershipArityConstraint_view.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryMembershipArityConstraint_view.xml index 6a47f700acee58e2483c2814fb30d38eb17c434b..778ae5266f23cb3670e170d72c7b4f55eda0b41f 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryMembershipArityConstraint_view.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryMembershipArityConstraint_view.xml @@ -100,7 +100,8 @@ <string>my_min_arity</string> <string>my_max_arity</string> <string>my_constraint_base_category_list</string> - <string>my_constraint_portal_type_list</string> + <string>my_constraint_portal_type</string> + <string>my_use_acquisition</string> </list> </value> </item> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryMembershipArityConstraint_view/my_constraint_portal_type_list.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryMembershipArityConstraint_view/my_constraint_portal_type.xml similarity index 89% rename from product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryMembershipArityConstraint_view/my_constraint_portal_type_list.xml rename to product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryMembershipArityConstraint_view/my_constraint_portal_type.xml index d03f36ad7ed699f93950e80faf507665858f704e..81be612b367bf1d0e92a5c3617858b1c481da66d 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryMembershipArityConstraint_view/my_constraint_portal_type_list.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryMembershipArityConstraint_view/my_constraint_portal_type.xml @@ -10,14 +10,14 @@ <key> <string>delegated_list</string> </key> <value> <list> + <string>display_width</string> <string>title</string> - <string>view_separator</string> </list> </value> </item> <item> <key> <string>id</string> </key> - <value> <string>my_constraint_portal_type_list</string> </value> + <value> <string>my_constraint_portal_type</string> </value> </item> <item> <key> <string>message_values</string> </key> @@ -72,9 +72,13 @@ <key> <string>values</string> </key> <value> <dictionary> + <item> + <key> <string>display_width</string> </key> + <value> <int>20</int> </value> + </item> <item> <key> <string>field_id</string> </key> - <value> <string>my_lines_field</string> </value> + <value> <string>my_string_field</string> </value> </item> <item> <key> <string>form_id</string> </key> @@ -88,15 +92,6 @@ <key> <string>title</string> </key> <value> <string>Constraint Portal Types</string> </value> </item> - <item> - <key> <string>view_separator</string> </key> - <value> <string encoding="cdata"><![CDATA[ - -<br />\n - - -]]></string> </value> - </item> </dictionary> </value> </item> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryMembershipArityConstraint_view/my_use_acquisition.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryMembershipArityConstraint_view/my_use_acquisition.xml new file mode 100644 index 0000000000000000000000000000000000000000..2695d0e53e034779844f8c1ba8a8f66c2656f960 --- /dev/null +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryMembershipArityConstraint_view/my_use_acquisition.xml @@ -0,0 +1,101 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <global name="ProxyField" module="Products.ERP5Form.ProxyField"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>delegated_list</string> </key> + <value> + <list> + <string>description</string> + <string>title</string> + </list> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>my_use_acquisition</string> </value> + </item> + <item> + <key> <string>message_values</string> </key> + <value> + <dictionary> + <item> + <key> <string>external_validator_failed</string> </key> + <value> <string>The input failed the external validator.</string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>overrides</string> </key> + <value> + <dictionary> + <item> + <key> <string>field_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>target</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>tales</string> </key> + <value> + <dictionary> + <item> + <key> <string>field_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>target</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>values</string> </key> + <value> + <dictionary> + <item> + <key> <string>description</string> </key> + <value> <string>Check category membership arity with acquisition</string> </value> + </item> + <item> + <key> <string>field_id</string> </key> + <value> <string>my_checkbox</string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string>Base_viewFieldLibrary</string> </value> + </item> + <item> + <key> <string>target</string> </key> + <value> <string>Click to edit the target</string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Use acquisition</string> </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryRelatedMembershipArityConstraint_view.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryRelatedMembershipArityConstraint_view.xml index 16cc92859a2611e11201bcbef1f0d168200d8a86..5cd5ba39599d828e77787e9f43990897d810f351 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryRelatedMembershipArityConstraint_view.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryRelatedMembershipArityConstraint_view.xml @@ -100,7 +100,7 @@ <string>my_min_arity</string> <string>my_max_arity</string> <string>my_constraint_base_category_list</string> - <string>my_constraint_portal_type_list</string> + <string>my_constraint_portal_type</string> <string>my_filter_parameter</string> </list> </value> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryExistenceConstraint_view/my_constraint_portal_type_list.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryRelatedMembershipArityConstraint_view/my_constraint_portal_type.xml similarity index 89% rename from product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryExistenceConstraint_view/my_constraint_portal_type_list.xml rename to product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryRelatedMembershipArityConstraint_view/my_constraint_portal_type.xml index d03f36ad7ed699f93950e80faf507665858f704e..81be612b367bf1d0e92a5c3617858b1c481da66d 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryExistenceConstraint_view/my_constraint_portal_type_list.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryRelatedMembershipArityConstraint_view/my_constraint_portal_type.xml @@ -10,14 +10,14 @@ <key> <string>delegated_list</string> </key> <value> <list> + <string>display_width</string> <string>title</string> - <string>view_separator</string> </list> </value> </item> <item> <key> <string>id</string> </key> - <value> <string>my_constraint_portal_type_list</string> </value> + <value> <string>my_constraint_portal_type</string> </value> </item> <item> <key> <string>message_values</string> </key> @@ -72,9 +72,13 @@ <key> <string>values</string> </key> <value> <dictionary> + <item> + <key> <string>display_width</string> </key> + <value> <int>20</int> </value> + </item> <item> <key> <string>field_id</string> </key> - <value> <string>my_lines_field</string> </value> + <value> <string>my_string_field</string> </value> </item> <item> <key> <string>form_id</string> </key> @@ -88,15 +92,6 @@ <key> <string>title</string> </key> <value> <string>Constraint Portal Types</string> </value> </item> - <item> - <key> <string>view_separator</string> </key> - <value> <string encoding="cdata"><![CDATA[ - -<br />\n - - -]]></string> </value> - </item> </dictionary> </value> </item> diff --git a/product/ERP5/bootstrap/erp5_core/bt/change_log b/product/ERP5/bootstrap/erp5_core/bt/change_log index 244846cfd14082fd2c17475398cb46feea6d52b8..2c2b3c391d5dba3c1f9d268eaaa2205c03790b0f 100644 --- a/product/ERP5/bootstrap/erp5_core/bt/change_log +++ b/product/ERP5/bootstrap/erp5_core/bt/change_log @@ -1,3 +1,9 @@ +2011-02-02 arnaud.fontaine +* Remove Category Acquired Membership Arity Constraint portal type in favor of Category Membership Arity Constraint and add a boolean in the view to handle both. +* Add a boolean in Category Existence Constraint view to handle Category Acquired Existence Constraint. +* Add missing Active Process in Activity Tools allowed_content_type. +* constraint_portal_type for CategoryExistenceConstraint_view, CategoryMembershipArityConstraint_view and CategoryRelatedMembershipArityConstraint_view should have always been a string to allow definition with a TALES Expression. + 2011-02-02 nicolas.dumazet * Add Activity Tool and Active Processes portal types diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision index fae6c48b94dd2f5244ad1b40aa3777b52cc038a9..d41631298419d5870de5be4548f0ceaf12151a3e 100644 --- a/product/ERP5/bootstrap/erp5_core/bt/revision +++ b/product/ERP5/bootstrap/erp5_core/bt/revision @@ -1 +1 @@ -40862 \ No newline at end of file +40865 \ No newline at end of file diff --git a/product/ERP5/bootstrap/erp5_core/bt/template_action_path_list b/product/ERP5/bootstrap/erp5_core/bt/template_action_path_list index faa3d5a2f7d7a842d289fe047cee57b429794928..17e36dbc30b1445360f4047356ce41aefd3a3ef8 100644 --- a/product/ERP5/bootstrap/erp5_core/bt/template_action_path_list +++ b/product/ERP5/bootstrap/erp5_core/bt/template_action_path_list @@ -36,8 +36,6 @@ Cache Factory | statistics Cache Factory | view Cache Tool | statistics Cache Tool | view -Category Acquired Membership Arity Constraint | predicate -Category Acquired Membership Arity Constraint | view Category Existence Constraint | predicate Category Existence Constraint | view Category Membership Arity Constraint | predicate diff --git a/product/ERP5/bootstrap/erp5_core/bt/template_portal_type_allowed_content_type_list b/product/ERP5/bootstrap/erp5_core/bt/template_portal_type_allowed_content_type_list index 376fe4ebe428f8f2067f4962be7164f7c7d1232a..77b77e146b33d09ef22d8ce2b7aba98af99f72fc 100644 --- a/product/ERP5/bootstrap/erp5_core/bt/template_portal_type_allowed_content_type_list +++ b/product/ERP5/bootstrap/erp5_core/bt/template_portal_type_allowed_content_type_list @@ -26,7 +26,6 @@ Property Sheet Tool | Property Sheet Property Sheet | Accounting Transaction Balance Constraint Property Sheet | Acquired Property Property Sheet | Attribute Equality Constraint -Property Sheet | Category Acquired Membership Arity Constraint Property Sheet | Category Existence Constraint Property Sheet | Category Membership Arity Constraint Property Sheet | Category Property diff --git a/product/ERP5/bootstrap/erp5_core/bt/template_portal_type_id_list b/product/ERP5/bootstrap/erp5_core/bt/template_portal_type_id_list index a20f82571ecf9ab3e84072380186a784f7d974b5..fd75883c215eb246e89d6891bc87c02b955e41cd 100644 --- a/product/ERP5/bootstrap/erp5_core/bt/template_portal_type_id_list +++ b/product/ERP5/bootstrap/erp5_core/bt/template_portal_type_id_list @@ -16,7 +16,6 @@ Base Type Cache Factory Cache Tool Category -Category Acquired Membership Arity Constraint Category Existence Constraint Category Membership Arity Constraint Category Property diff --git a/product/ERP5/bootstrap/erp5_core/bt/template_portal_type_workflow_chain_list b/product/ERP5/bootstrap/erp5_core/bt/template_portal_type_workflow_chain_list index 859c0c03a7c957055e01a5ab2aa88f31bc831097..ea31f7f9036e8ed2f2f00f73aa86eeb62849e273 100644 --- a/product/ERP5/bootstrap/erp5_core/bt/template_portal_type_workflow_chain_list +++ b/product/ERP5/bootstrap/erp5_core/bt/template_portal_type_workflow_chain_list @@ -7,7 +7,6 @@ Base Category | dynamic_class_generation_interaction_workflow Base Category | edit_workflow Base Type | base_type_interaction_workflow Base Type | dynamic_class_generation_interaction_workflow -Category Acquired Membership Arity Constraint | dynamic_class_generation_interaction_workflow Category Existence Constraint | dynamic_class_generation_interaction_workflow Category Membership Arity Constraint | dynamic_class_generation_interaction_workflow Category Property | dynamic_class_generation_interaction_workflow