From 9d657b19b3b4b52f3bc5224b61756b2c8675d9cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com> Date: Thu, 14 Dec 2006 12:40:06 +0000 Subject: [PATCH] Added related keys for 'parent' to force the use of catalog.parent_uid git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@11717 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../z_related_parent.catalog_keys.xml | 2 + .../erp5_mysql/z_related_parent.xml | 137 ++++++++++++++++++ .../related_key_list.xml | 6 + product/ERP5/bootstrap/erp5_core/bt/revision | 2 +- .../bt/template_catalog_method_id_list | 1 + .../bt/template_catalog_related_key_list | 8 +- 6 files changed, 154 insertions(+), 2 deletions(-) create mode 100644 product/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_parent.catalog_keys.xml create mode 100644 product/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_parent.xml diff --git a/product/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_parent.catalog_keys.xml b/product/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_parent.catalog_keys.xml new file mode 100644 index 0000000000..7d6996cb9c --- /dev/null +++ b/product/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_parent.catalog_keys.xml @@ -0,0 +1,2 @@ +<catalog_method> +</catalog_method> \ No newline at end of file diff --git a/product/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_parent.xml b/product/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_parent.xml new file mode 100644 index 0000000000..1d7b38a435 --- /dev/null +++ b/product/ERP5/bootstrap/erp5_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_parent.xml @@ -0,0 +1,137 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <tuple> + <string>Products.ZSQLMethods.SQL</string> + <string>SQL</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>__ac_local_roles__</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>_arg</string> </key> + <value> + <object> + <klass> + <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/> + </klass> + <tuple/> + <state> + <dictionary> + <item> + <key> <string>_data</string> </key> + <value> + <dictionary> + <item> + <key> <string>query_table</string> </key> + <value> + <dictionary/> + </value> + </item> + <item> + <key> <string>table_0</string> </key> + <value> + <dictionary/> + </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>_keys</string> </key> + <value> + <list> +<string>table_0</string> +<string>query_table</string> + </list> + </value> + </item> + </dictionary> + </state> + </object> + </value> + </item> + <item> + <key> <string>arguments_src</string> </key> + <value> <string>table_0\r\n +query_table</string> </value> + </item> + <item> + <key> <string>connection_id</string> </key> + <value> <string>erp5_sql_connection</string> </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>z_related_parent</string> </value> + </item> + <item> + <key> <string>src</string> </key> + <value> <string encoding="cdata"><![CDATA[ + +<dtml-var table_0>.parent_uid = <dtml_var query_table>.uid\n + + +]]></string> </value> + </item> + <item> + <key> <string>template</string> </key> + <value> + <object> + <klass> + <global name="SQL" module="Shared.DC.ZRDB.DA"/> + </klass> + <none/> + <state> + <dictionary> + <item> + <key> <string>__name__</string> </key> + <value> <string encoding="cdata"><![CDATA[ + +<string> + +]]></string> </value> + </item> + <item> + <key> <string>_vars</string> </key> + <value> + <dictionary/> + </value> + </item> + <item> + <key> <string>globals</string> </key> + <value> + <dictionary/> + </value> + </item> + <item> + <key> <string>raw</string> </key> + <value> <string encoding="cdata"><![CDATA[ + +<dtml-var table_0>.parent_uid = <dtml_var query_table>.uid\n + + +]]></string> </value> + </item> + </dictionary> + </state> + </object> + </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/product/ERP5/bootstrap/erp5_core/CatalogRelatedKeyTemplateItem/related_key_list.xml b/product/ERP5/bootstrap/erp5_core/CatalogRelatedKeyTemplateItem/related_key_list.xml index cd0ae529e6..0f02e52f25 100644 --- a/product/ERP5/bootstrap/erp5_core/CatalogRelatedKeyTemplateItem/related_key_list.xml +++ b/product/ERP5/bootstrap/erp5_core/CatalogRelatedKeyTemplateItem/related_key_list.xml @@ -10,7 +10,13 @@ <key>item_node_category_uid | category/category_uid/z_related_node_uid_from_item</key> <key>item_resource_category_uid | category/category_uid/z_related_resource_uid_from_item</key> <key>item_section_category_uid | category/category_uid/z_related_section_uid_from_item</key> + <key>parent_description | catalog/description/z_related_parent</key> + <key>parent_float_index | catalog/float_index/z_related_parent</key> + <key>parent_int_index | catalog/int_index/z_related_parent</key> + <key>parent_reference | catalog/reference/z_related_parent</key> <key>parent_specialise_portal_type | category,catalog/portal_type/z_related_parent_specialise</key> + <key>parent_string_index | catalog/string_index/z_related_parent</key> + <key>parent_title | catalog/title/z_related_parent</key> <key>predicate_uid | predicate/uid/z_related_predicate</key> <key>resourceType | movement,catalog/portal_type/z_related_resource_from_movement</key> <key>stock_mirror_section_category_strict_membership_uid | category/category_uid/z_related_strict_membership_mirror_section_uid_from_stock</key> diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision index 0acdeb509d..e99fdcc524 100644 --- a/product/ERP5/bootstrap/erp5_core/bt/revision +++ b/product/ERP5/bootstrap/erp5_core/bt/revision @@ -1 +1 @@ -216 \ No newline at end of file +217 \ No newline at end of file diff --git a/product/ERP5/bootstrap/erp5_core/bt/template_catalog_method_id_list b/product/ERP5/bootstrap/erp5_core/bt/template_catalog_method_id_list index 0446ff681a..9491755ed7 100644 --- a/product/ERP5/bootstrap/erp5_core/bt/template_catalog_method_id_list +++ b/product/ERP5/bootstrap/erp5_core/bt/template_catalog_method_id_list @@ -73,6 +73,7 @@ erp5_mysql/z_related_explanation erp5_mysql/z_related_grand_parent erp5_mysql/z_related_mirror_section_uid_from_stock erp5_mysql/z_related_node_uid_from_stock +erp5_mysql/z_related_parent erp5_mysql/z_related_parent_specialise erp5_mysql/z_related_payment_uid_from_stock erp5_mysql/z_related_predicate diff --git a/product/ERP5/bootstrap/erp5_core/bt/template_catalog_related_key_list b/product/ERP5/bootstrap/erp5_core/bt/template_catalog_related_key_list index fffb987d8c..d9d3aee15d 100644 --- a/product/ERP5/bootstrap/erp5_core/bt/template_catalog_related_key_list +++ b/product/ERP5/bootstrap/erp5_core/bt/template_catalog_related_key_list @@ -32,4 +32,10 @@ resourceType | movement,catalog/portal_type/z_related_resource_from_movement grand_parent_portal_type | catalog,catalog/portal_type/z_related_grand_parent variationCategory | category/category_uid/z_related_uid translated_validation_state | translation/translated_message/z_related_translated_validation_state -stock_resource_category_uid | category/category_uid/z_related_resource_uid_from_stock \ No newline at end of file +stock_resource_category_uid | category/category_uid/z_related_resource_uid_from_stock +parent_title | catalog/title/z_related_parent +parent_int_index | catalog/int_index/z_related_parent +parent_string_index | catalog/string_index/z_related_parent +parent_float_index | catalog/float_index/z_related_parent +parent_reference | catalog/reference/z_related_parent +parent_description | catalog/description/z_related_parent \ No newline at end of file -- 2.30.9