diff --git a/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_resource_use.catalog_keys.xml b/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_resource_use.catalog_keys.xml new file mode 100644 index 0000000000000000000000000000000000000000..7d6996cb9cc91ab4fe5229d7497a904d6d982ee2 --- /dev/null +++ b/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_resource_use.catalog_keys.xml @@ -0,0 +1,2 @@ +<catalog_method> +</catalog_method> \ No newline at end of file diff --git a/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_resource_use.xml b/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_resource_use.xml new file mode 100644 index 0000000000000000000000000000000000000000..74db7e159f82c4bc6bdd846243b772bdafc3c110 --- /dev/null +++ b/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_resource_use.xml @@ -0,0 +1,154 @@ +<?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> + <item> + <key> <string>table_2</string> </key> + <value> + <dictionary/> + </value> + </item> + <item> + <key> <string>table_3</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> + <string>table_2</string> + <string>table_3</string> + </list> + </value> + </item> + </dictionary> + </state> + </object> + </value> + </item> + <item> + <key> <string>arguments_src</string> </key> + <value> <string>table_0\r\n +table_1\r\n +table_2\r\n +table_3</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_resource_use</string> </value> + </item> + <item> + <key> <string>src</string> </key> + <value> <string encoding="cdata"><![CDATA[ + +<dtml-var table_0>.uid = catalog.uid\n +AND <dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.resource.getUid()">\n +AND <dtml-var table_0>.category_uid=<dtml-var table_2>.uid\n +AND <dtml-var table_1>.uid = <dtml-var table_2>.uid\n +AND <dtml-var table_1>.base_category_uid = <dtml-var "portal_categories.use.getUid()">\n +AND <dtml-var table_1>.category_uid = <dtml-var table_3>.uid + +]]></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_0>.uid = catalog.uid\n +AND <dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.resource.getUid()">\n +AND <dtml-var table_0>.category_uid=<dtml-var table_2>.uid\n +AND <dtml-var table_1>.uid = <dtml-var table_2>.uid\n +AND <dtml-var table_1>.base_category_uid = <dtml-var "portal_categories.use.getUid()">\n +AND <dtml-var table_1>.category_uid = <dtml-var table_3>.uid + +]]></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/bt5/erp5_base/CatalogRelatedKeyTemplateItem/related_key_list.xml b/bt5/erp5_base/CatalogRelatedKeyTemplateItem/related_key_list.xml index de826030e0fb687296ab10cfed4175c0e2400ecb..b52e959b0fdcdb0ed626f5e172045bc8d6793001 100644 --- a/bt5/erp5_base/CatalogRelatedKeyTemplateItem/related_key_list.xml +++ b/bt5/erp5_base/CatalogRelatedKeyTemplateItem/related_key_list.xml @@ -1,6 +1,7 @@ <key_list> - <key>default_email_text | catalog,email/url_string/z_related_default_email</key> - <key>destination_person_title | category,catalog/title/z_related_destination_person</key> - <key>source_organisation_title | category,catalog/title/z_related_source_organisation</key> - <key>source_person_title | category,catalog/title/z_related_source_person</key> -</key_list> + <key>default_email_text | catalog,email/url_string/z_related_default_email</key> + <key>destination_person_title | category,catalog/title/z_related_destination_person</key> + <key>related_resource_use_uid | category,category,catalog,catalog/uid/z_related_resource_use</key> + <key>source_organisation_title | category,catalog/title/z_related_source_organisation</key> + <key>source_person_title | category,catalog/title/z_related_source_person</key> +</key_list> \ No newline at end of file diff --git a/bt5/erp5_base/bt/revision b/bt5/erp5_base/bt/revision index 82d45208ede2ef6946cb2c5ad46878a1099ea392..ed615204d1f10f12c716d53b21557ddfa0f104c0 100644 --- a/bt5/erp5_base/bt/revision +++ b/bt5/erp5_base/bt/revision @@ -1 +1 @@ -589 +590 \ No newline at end of file diff --git a/bt5/erp5_base/bt/template_catalog_method_id_list b/bt5/erp5_base/bt/template_catalog_method_id_list index 3bb5ab54b668a3ad53abe74186796b4c67f7d3b5..5101896a1d603ef9a946b32450ec45ade46a45b3 100644 --- a/bt5/erp5_base/bt/template_catalog_method_id_list +++ b/bt5/erp5_base/bt/template_catalog_method_id_list @@ -1,4 +1,5 @@ erp5_mysql_innodb/z_related_default_email erp5_mysql_innodb/z_related_destination_person +erp5_mysql_innodb/z_related_resource_use erp5_mysql_innodb/z_related_source_organisation erp5_mysql_innodb/z_related_source_person \ No newline at end of file diff --git a/bt5/erp5_base/bt/template_catalog_related_key_list b/bt5/erp5_base/bt/template_catalog_related_key_list index d1b2297c95018a8554f0480c838caabbae4e4eb7..99ea09fbe73b63e3b91034bc95ee3f79b353eff1 100644 --- a/bt5/erp5_base/bt/template_catalog_related_key_list +++ b/bt5/erp5_base/bt/template_catalog_related_key_list @@ -1,4 +1,5 @@ source_organisation_title | category,catalog/title/z_related_source_organisation source_person_title | category,catalog/title/z_related_source_person destination_person_title | category,catalog/title/z_related_destination_person -default_email_text | catalog,email/url_string/z_related_default_email \ No newline at end of file +default_email_text | catalog,email/url_string/z_related_default_email +related_resource_use_uid | category,category,catalog,catalog/uid/z_related_resource_use \ No newline at end of file