From f4fafca49177e39ab1f823afd65b6ef20e8222cc Mon Sep 17 00:00:00 2001 From: Fabien Morin <fabien@nexedi.com> Date: Wed, 14 Jan 2009 16:59:01 +0000 Subject: [PATCH] oups, this is not the good bt, revert previous changes git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@25114 20353a03-c40f-0410-a6d1-a30d3c3de9de --- ..._parent_base_contribution.catalog_keys.xml | 2 - .../z_related_parent_base_contribution.xml | 168 ------------------ .../related_key_list.xml | 1 - .../erp5_mysql_innodb_catalog/bt/revision | 2 +- .../bt/template_catalog_method_id_list | 1 - .../bt/template_catalog_related_key_list | 1 - 6 files changed, 1 insertion(+), 174 deletions(-) delete mode 100644 product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_parent_base_contribution.catalog_keys.xml delete mode 100644 product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_parent_base_contribution.xml diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_parent_base_contribution.catalog_keys.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_parent_base_contribution.catalog_keys.xml deleted file mode 100644 index 7d6996cb9c..0000000000 --- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_parent_base_contribution.catalog_keys.xml +++ /dev/null @@ -1,2 +0,0 @@ -<catalog_method> -</catalog_method> \ No newline at end of file diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_parent_base_contribution.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_parent_base_contribution.xml deleted file mode 100644 index 8bc5410e4f..0000000000 --- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_parent_base_contribution.xml +++ /dev/null @@ -1,168 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <global name="SQL" module="Products.ZSQLMethods.SQL"/> - <tuple/> - </tuple> - </pickle> - <pickle> - <dictionary> - <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>table_0</string> </key> - <value> - <dictionary/> - </value> - </item> - <item> - <key> <string>table_1</string> </key> - <value> - <dictionary/> - </value> - </item> - </dictionary> - </value> - </item> - <item> - <key> <string>_keys</string> </key> - <value> - <list> - <string>table_0</string> - <string>table_1</string> - </list> - </value> - </item> - </dictionary> - </state> - </object> - </value> - </item> - <item> - <key> <string>allow_simple_one_argument_traversal</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>arguments_src</string> </key> - <value> <string>table_0\r\n -table_1</string> </value> - </item> - <item> - <key> <string>cache_time_</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>class_file_</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>class_name_</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>connection_hook</string> </key> - <value> - <none/> - </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_base_contribution</string> </value> - </item> - <item> - <key> <string>max_cache_</string> </key> - <value> <int>100</int> </value> - </item> - <item> - <key> <string>max_rows_</string> </key> - <value> <int>1000</int> </value> - </item> - <item> - <key> <string>src</string> </key> - <value> <string encoding="cdata"><![CDATA[ - -<dtml-var table_1>.uid = <dtml-var table_0>.category_uid\n -AND <dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.base_contribution.getUid()">\n -AND <dtml-var table_0>.uid = catalog.parent_uid\n -\n - - -]]></string> </value> - </item> - <item> - <key> <string>template</string> </key> - <value> - <object> - <klass> - <global name="__newobj__" module="copy_reg"/> - </klass> - <tuple> - <global name="SQL" module="Shared.DC.ZRDB.DA"/> - </tuple> - <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_1>.uid = <dtml-var table_0>.category_uid\n -AND <dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.base_contribution.getUid()">\n -AND <dtml-var table_0>.uid = catalog.parent_uid\n -\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_mysql_innodb_catalog/CatalogRelatedKeyTemplateItem/related_key_list.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogRelatedKeyTemplateItem/related_key_list.xml index 95be14a465..5f5f8c8498 100644 --- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogRelatedKeyTemplateItem/related_key_list.xml +++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogRelatedKeyTemplateItem/related_key_list.xml @@ -12,7 +12,6 @@ <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>metric_type_uid | measure/metric_type_uid/z_related_metric_type</key> - <key>parent_base_contribution_uid | category,catalog/uid/z_related_parent_base_contribution</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> diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision index b9c6c007cc..dd1ec209f3 100644 --- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision +++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision @@ -1 +1 @@ -131 \ No newline at end of file +132 \ No newline at end of file diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_catalog_method_id_list b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_catalog_method_id_list index 67c3492b43..c51012b39b 100644 --- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_catalog_method_id_list +++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_catalog_method_id_list @@ -82,7 +82,6 @@ erp5_mysql_innodb/z_related_metric_type erp5_mysql_innodb/z_related_mirror_section_uid_from_stock erp5_mysql_innodb/z_related_node_uid_from_stock erp5_mysql_innodb/z_related_parent -erp5_mysql_innodb/z_related_parent_base_contribution erp5_mysql_innodb/z_related_parent_specialise erp5_mysql_innodb/z_related_parent_strict_group erp5_mysql_innodb/z_related_payment_uid_from_stock diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_catalog_related_key_list b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_catalog_related_key_list index 675ce93007..2ae99d39bb 100644 --- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_catalog_related_key_list +++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_catalog_related_key_list @@ -45,5 +45,4 @@ parent_portal_type | catalog/portal_type/z_related_parent translated_causality_state | translation/translated_message/z_related_translated_causality_state translated_causality_state_title | translation/translated_message/z_related_translated_causality_state_title metric_type_uid | measure/metric_type_uid/z_related_metric_type -parent_base_contribution_uid | category,catalog/uid/z_related_parent_base_contribution parent_strict_group_uid | category,catalog/uid/z_related_parent_strict_group \ No newline at end of file -- 2.30.9