[Erp5-report] r26655 - in /erp5/trunk/bt5/erp5_base: CatalogMethodTemplateItem/portal_catal...
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon Apr 27 12:04:56 CEST 2009
Author: luke
Date: Mon Apr 27 12:04:54 2009
New Revision: 26655
URL: http://svn.erp5.org?rev=26655&view=rev
Log:
- add related key to filter objects by related resource use category
Added:
erp5/trunk/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_resource_use.catalog_keys.xml
erp5/trunk/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_resource_use.xml
Modified:
erp5/trunk/bt5/erp5_base/CatalogRelatedKeyTemplateItem/related_key_list.xml
erp5/trunk/bt5/erp5_base/bt/revision
erp5/trunk/bt5/erp5_base/bt/template_catalog_method_id_list
erp5/trunk/bt5/erp5_base/bt/template_catalog_related_key_list
Added: erp5/trunk/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_resource_use.catalog_keys.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_resource_use.catalog_keys.xml?rev=26655&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_resource_use.catalog_keys.xml (added)
+++ erp5/trunk/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_resource_use.catalog_keys.xml [utf8] Mon Apr 27 12:04:54 2009
@@ -1,0 +1,2 @@
+<catalog_method>
+</catalog_method>
Added: erp5/trunk/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_resource_use.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_resource_use.xml?rev=26655&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_resource_use.xml (added)
+++ erp5/trunk/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_resource_use.xml [utf8] Mon Apr 27 12:04:54 2009
@@ -1,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>
Modified: erp5/trunk/bt5/erp5_base/CatalogRelatedKeyTemplateItem/related_key_list.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/CatalogRelatedKeyTemplateItem/related_key_list.xml?rev=26655&r1=26654&r2=26655&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/CatalogRelatedKeyTemplateItem/related_key_list.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/CatalogRelatedKeyTemplateItem/related_key_list.xml [utf8] Mon Apr 27 12:04:54 2009
@@ -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>
Modified: erp5/trunk/bt5/erp5_base/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/bt/revision?rev=26655&r1=26654&r2=26655&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/bt/revision [utf8] Mon Apr 27 12:04:54 2009
@@ -1,1 +1,1 @@
-589
+590
Modified: erp5/trunk/bt5/erp5_base/bt/template_catalog_method_id_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/bt/template_catalog_method_id_list?rev=26655&r1=26654&r2=26655&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/bt/template_catalog_method_id_list [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/bt/template_catalog_method_id_list [utf8] Mon Apr 27 12:04:54 2009
@@ -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
Modified: erp5/trunk/bt5/erp5_base/bt/template_catalog_related_key_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/bt/template_catalog_related_key_list?rev=26655&r1=26654&r2=26655&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/bt/template_catalog_related_key_list [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/bt/template_catalog_related_key_list [utf8] Mon Apr 27 12:04:54 2009
@@ -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
+default_email_text | catalog,email/url_string/z_related_default_email
+related_resource_use_uid | category,category,catalog,catalog/uid/z_related_resource_use
More information about the Erp5-report
mailing list