diff --git a/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_email.xml b/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_email.xml index 52afb30c341ca97bff7cbbd41dd848ff371c4368..f9875fe03f4c1b9d03859c11ca94aeeacbed66ae 100644 --- a/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_email.xml +++ b/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_email.xml @@ -2,7 +2,7 @@ <ZopeData> <record id="1" aka="AAAAAAAAAAE="> <pickle> - <global name="SQL" module="Products.ZSQLMethods.SQL"/> + <global name="SQL Method" module="erp5.portal_type"/> </pickle> <pickle> <dictionary> @@ -24,6 +24,10 @@ <key> <string>id</string> </key> <value> <string>z0_drop_email</string> </value> </item> + <item> + <key> <string>portal_type</string> </key> + <value> <string>SQL Method</string> </value> + </item> <item> <key> <string>title</string> </key> <value> <string></string> </value> diff --git a/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_email.catalog_keys.xml b/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_email.catalog_keys.xml index 7d029609c4f71fd71aa6f94bfac76ad6f5c88407..d29d36d9f07b76c1a31ae6bec739102b93101efd 100644 --- a/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_email.catalog_keys.xml +++ b/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_email.catalog_keys.xml @@ -2,13 +2,4 @@ <item key="sql_uncatalog_object" type="int"> <value>1</value> </item> - <item key="_is_filtered_archive" type="int"> - <value>1</value> - </item> - <item key="_filter_expression_archive" type="str"> - <value>python: context.getPortalType() in ('Email', 'Fax', 'Telephone',)</value> - </item> - <item key="_filter_expression_cache_key_archive" type="tuple"> - <value>portal_type</value> - </item> </catalog_method> diff --git a/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_email.xml b/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_email.xml index ee35f48189c681c0f71313f72e743d03a022ae95..d1c50796d6ed528fef8a80ffee62b287947614d1 100644 --- a/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_email.xml +++ b/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_email.xml @@ -2,7 +2,7 @@ <ZopeData> <record id="1" aka="AAAAAAAAAAE="> <pickle> - <global name="SQL" module="Products.ZSQLMethods.SQL"/> + <global name="SQL Method" module="erp5.portal_type"/> </pickle> <pickle> <dictionary> @@ -14,14 +14,59 @@ <key> <string>connection_id</string> </key> <value> <string>erp5_sql_connection</string> </value> </item> + <item> + <key> <string>expression</string> </key> + <value> <string>python: context.getPortalType() in (\'Email\', \'Fax\', \'Telephone\',)</string> </value> + </item> + <item> + <key> <string>expression_cache_key</string> </key> + <value> + <tuple> + <string>portal_type</string> + </tuple> + </value> + </item> + <item> + <key> <string>expression_instance</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> + </item> + <item> + <key> <string>filtered</string> </key> + <value> <int>1</int> </value> + </item> <item> <key> <string>id</string> </key> <value> <string>z0_uncatalog_email</string> </value> </item> + <item> + <key> <string>portal_type</string> </key> + <value> <string>SQL Method</string> </value> + </item> <item> <key> <string>title</string> </key> <value> <string></string> </value> </item> + <item> + <key> <string>type</string> </key> + <value> + <tuple/> + </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>python: context.getPortalType() in (\'Email\', \'Fax\', \'Telephone\',)</string> </value> + </item> </dictionary> </pickle> </record> diff --git a/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_email_list.catalog_keys.xml b/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_email_list.catalog_keys.xml index 7998db3e959c5d96a0097de787b6ca219e7941fb..c95a68655e4b28b9b03081ca25caf201b2237d18 100644 --- a/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_email_list.catalog_keys.xml +++ b/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_email_list.catalog_keys.xml @@ -2,13 +2,4 @@ <item key="sql_catalog_object_list" type="int"> <value>1</value> </item> - <item key="_is_filtered_archive" type="int"> - <value>1</value> - </item> - <item key="_filter_expression_archive" type="str"> - <value>python: context.getPortalType() in ('Email', 'Fax', 'Telephone')</value> - </item> - <item key="_filter_expression_cache_key_archive" type="tuple"> - <value>portal_type</value> - </item> </catalog_method> diff --git a/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_email_list.xml b/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_email_list.xml index 1b9f0646c44e8a02fd51f7ab300769c103f0d229..88b2b9a813bce9ec29f1ff2914262a6d080cb1a6 100644 --- a/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_email_list.xml +++ b/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_email_list.xml @@ -2,7 +2,7 @@ <ZopeData> <record id="1" aka="AAAAAAAAAAE="> <pickle> - <global name="SQL" module="Products.ZSQLMethods.SQL"/> + <global name="SQL Method" module="erp5.portal_type"/> </pickle> <pickle> <dictionary> @@ -16,14 +16,59 @@ getPortalType</string> </value> <key> <string>connection_id</string> </key> <value> <string>erp5_sql_connection</string> </value> </item> + <item> + <key> <string>expression</string> </key> + <value> <string>python: context.getPortalType() in (\'Email\', \'Fax\', \'Telephone\')</string> </value> + </item> + <item> + <key> <string>expression_cache_key</string> </key> + <value> + <tuple> + <string>portal_type</string> + </tuple> + </value> + </item> + <item> + <key> <string>expression_instance</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> + </item> + <item> + <key> <string>filtered</string> </key> + <value> <int>1</int> </value> + </item> <item> <key> <string>id</string> </key> <value> <string>z_catalog_email_list</string> </value> </item> + <item> + <key> <string>portal_type</string> </key> + <value> <string>SQL Method</string> </value> + </item> <item> <key> <string>title</string> </key> <value> <string></string> </value> </item> + <item> + <key> <string>type</string> </key> + <value> + <tuple/> + </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>python: context.getPortalType() in (\'Email\', \'Fax\', \'Telephone\')</string> </value> + </item> </dictionary> </pickle> </record> diff --git a/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_email.xml b/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_email.xml index 6a19dbf853739f0ebed1b3d1aba9bd5eb85b4f44..72a96941949b19e82dbc71c5beee8346c226c13e 100644 --- a/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_email.xml +++ b/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_email.xml @@ -2,7 +2,7 @@ <ZopeData> <record id="1" aka="AAAAAAAAAAE="> <pickle> - <global name="SQL" module="Products.ZSQLMethods.SQL"/> + <global name="SQL Method" module="erp5.portal_type"/> </pickle> <pickle> <dictionary> @@ -24,6 +24,10 @@ <key> <string>id</string> </key> <value> <string>z_create_email</string> </value> </item> + <item> + <key> <string>portal_type</string> </key> + <value> <string>SQL Method</string> </value> + </item> <item> <key> <string>title</string> </key> <value> <string></string> </value>