diff --git a/product/ERP5/bootstrap/erp5_core/PortalTypePropertySheetTemplateItem/property_sheet_list.xml b/product/ERP5/bootstrap/erp5_core/PortalTypePropertySheetTemplateItem/property_sheet_list.xml index 6f35c43ed1a39cd466c69447dd5bb1c530c98a90..693872edbed216b3f618e77cdc4cb05a820e2727 100644 --- a/product/ERP5/bootstrap/erp5_core/PortalTypePropertySheetTemplateItem/property_sheet_list.xml +++ b/product/ERP5/bootstrap/erp5_core/PortalTypePropertySheetTemplateItem/property_sheet_list.xml @@ -1,6 +1,5 @@ <property_sheet_list> <portal_type id="Document Component"> - <item>DocumentConstraint</item> <item>SortIndex</item> </portal_type> <portal_type id="Trash Bin"> diff --git a/product/ERP5/bootstrap/erp5_core/bt/change_log b/product/ERP5/bootstrap/erp5_core/bt/change_log index dd6cd22f4888d36ac7cacba377fa3d0a324c7f27..a0ddff18db7b1b13c954d57dac8f4d0750afbc22 100644 --- a/product/ERP5/bootstrap/erp5_core/bt/change_log +++ b/product/ERP5/bootstrap/erp5_core/bt/change_log @@ -1,3 +1,6 @@ +2012-02-25 arnaud.fontaine +* Remove useless DocumentConstraint Property Sheet for Document Component. + 2012-02-24 arnaud.fontaine * In Component view, show the error field in the left. diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision index f2bec4fc393f56b34f986b3fa680bad77df4ad96..3c537a41c7e981fba610ca531c8ddc2c536ee1d4 100644 --- a/product/ERP5/bootstrap/erp5_core/bt/revision +++ b/product/ERP5/bootstrap/erp5_core/bt/revision @@ -1 +1 @@ -41007 \ No newline at end of file +41008 \ 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 633648a1f1ab84efaf15f18cbca08a8cad9abba9..60167bacf4c8936e49cec15b6fb62647cf5822ca 100644 --- a/product/ERP5/bootstrap/erp5_core/bt/template_action_path_list +++ b/product/ERP5/bootstrap/erp5_core/bt/template_action_path_list @@ -66,8 +66,8 @@ Content Existence Constraint | view Contribution Predicate | view Contribution Registry Tool | view Distributed Ram Cache | view -Document | view Document Component | view +Document | view Domain Generator | view Domain Tool | view Domain | view diff --git a/product/ERP5/bootstrap/erp5_core/bt/template_portal_type_property_sheet_list b/product/ERP5/bootstrap/erp5_core/bt/template_portal_type_property_sheet_list index 8e72269ea86ac0fc459dd761c855712953a3808f..0375220908f8987209733594024c236b298d1b94 100644 --- a/product/ERP5/bootstrap/erp5_core/bt/template_portal_type_property_sheet_list +++ b/product/ERP5/bootstrap/erp5_core/bt/template_portal_type_property_sheet_list @@ -1,4 +1,3 @@ -Document Component | DocumentConstraint Document Component | SortIndex Trash Bin | Base Trash Bin | SimpleItem 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 affdc326cf69ac8169ef72bd5fe58f5ed161c8af..502ca25d37aba3978faf3f3c9d7f45f0f16567fa 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 @@ -22,10 +22,10 @@ Category | edit_workflow Component Tool | component_interaction_workflow Content Existence Constraint | dynamic_class_generation_interaction_workflow Distributed Ram Cache | distributed_ram_cache_interaction_workflow -Document | edit_workflow Document Component | component_interaction_workflow Document Component | component_validation_workflow Document Component | edit_workflow +Document | edit_workflow Dynamic Category Property | dynamic_class_generation_interaction_workflow Extension Component | component_interaction_workflow Extension Component | component_validation_workflow diff --git a/product/ERP5/bootstrap/erp5_core/bt/template_workflow_id_list b/product/ERP5/bootstrap/erp5_core/bt/template_workflow_id_list index eebb55f6f6f2adf588a4f034f840a0c83db070ce..7561cfa7ee55345b2769e59344df4f8de39a55a0 100644 --- a/product/ERP5/bootstrap/erp5_core/bt/template_workflow_id_list +++ b/product/ERP5/bootstrap/erp5_core/bt/template_workflow_id_list @@ -1,9 +1,9 @@ base_type_interaction_workflow business_template_building_workflow business_template_installation_workflow -distributed_ram_cache_interaction_workflow component_interaction_workflow component_validation_workflow +distributed_ram_cache_interaction_workflow dynamic_class_generation_interaction_workflow edit_workflow memcached_plugin_interaction_workflow diff --git a/product/ERP5Type/mixin/component.py b/product/ERP5Type/mixin/component.py index 2168f550750b1d615923c7e0ddd876911d17ddc3..96e6f196251394b00dcc55d1fc865fa0d17fc96f 100644 --- a/product/ERP5Type/mixin/component.py +++ b/product/ERP5Type/mixin/component.py @@ -163,7 +163,7 @@ class ComponentMixin(PropertyRecordableMixin, Base): """ XXX-arnau: should probably be in a separate Constraint class? """ - error_list = [] + error_list = super(ComponentMixin, self).checkConsistency(*args, **kw) object_relative_url = self.getRelativeUrl() reference = self.getReference()