[Erp5-report] r27313 - in /erp5/trunk/bt5/erp5_crm: CatalogMethodTemplateItem/portal_catalo...
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon Jun 1 15:38:30 CEST 2009
Author: nicolas
Date: Mon Jun 1 15:38:30 2009
New Revision: 27313
URL: http://svn.erp5.org?rev=27313&view=rev
Log:
add new related key to display related Events of an Organisation
Added:
erp5/trunk/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_or_source_section_or_destination_or_destination_section.catalog_keys.xml
erp5/trunk/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_or_source_section_or_destination_or_destination_section.xml
Modified:
erp5/trunk/bt5/erp5_crm/CatalogRelatedKeyTemplateItem/related_key_list.xml
erp5/trunk/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Entity_getRelatedEventList.xml
erp5/trunk/bt5/erp5_crm/bt/revision
erp5/trunk/bt5/erp5_crm/bt/template_catalog_method_id_list
erp5/trunk/bt5/erp5_crm/bt/template_catalog_related_key_list
Added: erp5/trunk/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_or_source_section_or_destination_or_destination_section.catalog_keys.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_or_source_section_or_destination_or_destination_section.catalog_keys.xml?rev=27313&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_or_source_section_or_destination_or_destination_section.catalog_keys.xml (added)
+++ erp5/trunk/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_or_source_section_or_destination_or_destination_section.catalog_keys.xml [utf8] Mon Jun 1 15:38:30 2009
@@ -1,0 +1,2 @@
+<catalog_method>
+</catalog_method>
Added: erp5/trunk/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_or_source_section_or_destination_or_destination_section.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_or_source_section_or_destination_or_destination_section.xml?rev=27313&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_or_source_section_or_destination_or_destination_section.xml (added)
+++ erp5/trunk/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_source_or_source_section_or_destination_or_destination_section.xml [utf8] Mon Jun 1 15:38:30 2009
@@ -1,0 +1,172 @@
+<?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>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>_keys</string> </key>
+ <value>
+ <list>
+ <string>table_0</string>
+ <string>table_1</string>
+ <string>table_2</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</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_source_or_source_section_or_destination_or_destination_section</string> </value>
+ </item>
+ <item>
+ <key> <string>src</string> </key>
+ <value> <string encoding="cdata"><![CDATA[
+
+<dtml-comment>\n
+table_0 : category as source or source_section or destination or destination_section\n
+table_1 : catalog as category\n
+table_2 : catalog as object_uid\n
+</dtml-comment>\n
+\n
+( \n
+ <dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.source.getUid()">\n
+ OR \n
+ <dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.source_section.getUid()">\n
+ OR\n
+ <dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.destination.getUid()">\n
+ OR \n
+ <dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.destination_section.getUid()">\n
+)\n
+AND\n
+<dtml-var table_0>.category_uid = <dtml-var table_2>.uid AND\n
+<dtml-var table_0>.uid = <dtml-var table_1>.uid AND\n
+<dtml-var table_1>.uid = catalog.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-comment>\n
+table_0 : category as source or source_section or destination or destination_section\n
+table_1 : catalog as category\n
+table_2 : catalog as object_uid\n
+</dtml-comment>\n
+\n
+( \n
+ <dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.source.getUid()">\n
+ OR \n
+ <dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.source_section.getUid()">\n
+ OR\n
+ <dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.destination.getUid()">\n
+ OR \n
+ <dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.destination_section.getUid()">\n
+)\n
+AND\n
+<dtml-var table_0>.category_uid = <dtml-var table_2>.uid AND\n
+<dtml-var table_0>.uid = <dtml-var table_1>.uid AND\n
+<dtml-var table_1>.uid = catalog.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_crm/CatalogRelatedKeyTemplateItem/related_key_list.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_crm/CatalogRelatedKeyTemplateItem/related_key_list.xml?rev=27313&r1=27312&r2=27313&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_crm/CatalogRelatedKeyTemplateItem/related_key_list.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_crm/CatalogRelatedKeyTemplateItem/related_key_list.xml [utf8] Mon Jun 1 15:38:30 2009
@@ -3,6 +3,7 @@
<key>related_source_decision_or_destination_decision | category,catalog,catalog/uid/z_related_source_decision_or_destination_decision</key>
<key>related_source_or_destination | category,catalog,catalog/uid/z_related_source_or_destination</key>
<key>related_source_or_source_decision_or_destination_or_destination_decision | category,catalog,catalog/uid/z_related_source_or_source_decision_or_destination_or_destination_decision</key>
+ <key>related_source_or_source_section_or_destination_or_destination_section | category,catalog,catalog/uid/z_related_source_or_source_section_or_destination_or_destination_section</key>
<key>related_source_section_or_destination_section | category,catalog,catalog/uid/z_related_source_section_or_destination_section</key>
<key>source_organisation_title | category,catalog/title/z_related_source_organisation</key>
</key_list>
Modified: erp5/trunk/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Entity_getRelatedEventList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Entity_getRelatedEventList.xml?rev=27313&r1=27312&r2=27313&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Entity_getRelatedEventList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Entity_getRelatedEventList.xml [utf8] Mon Jun 1 15:38:30 2009
@@ -54,7 +54,7 @@
<item>
<key> <string>_body</string> </key>
<value> <string>if context.getPortalType() == \'Organisation\':\n
- kw[\'related_source_section_or_destination_section\'] = [context.getUid()]\n
+ kw[\'related_source_or_source_section_or_destination_or_destination_section\'] = [context.getUid()]\n
else:\n
kw[\'related_source_or_destination\'] = [context.getUid()]\n
return context.portal_catalog(**kw)\n
Modified: erp5/trunk/bt5/erp5_crm/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_crm/bt/revision?rev=27313&r1=27312&r2=27313&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_crm/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_crm/bt/revision [utf8] Mon Jun 1 15:38:30 2009
@@ -1,1 +1,1 @@
-411
+412
Modified: erp5/trunk/bt5/erp5_crm/bt/template_catalog_method_id_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_crm/bt/template_catalog_method_id_list?rev=27313&r1=27312&r2=27313&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_crm/bt/template_catalog_method_id_list [utf8] (original)
+++ erp5/trunk/bt5/erp5_crm/bt/template_catalog_method_id_list [utf8] Mon Jun 1 15:38:30 2009
@@ -2,5 +2,6 @@
erp5_mysql_innodb/z_related_source_decision_or_destination_decision
erp5_mysql_innodb/z_related_source_or_destination
erp5_mysql_innodb/z_related_source_or_source_decision_or_destination_or_destination_decision
+erp5_mysql_innodb/z_related_source_or_source_section_or_destination_or_destination_section
erp5_mysql_innodb/z_related_source_organisation
erp5_mysql_innodb/z_related_source_section_or_destination_section
Modified: erp5/trunk/bt5/erp5_crm/bt/template_catalog_related_key_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_crm/bt/template_catalog_related_key_list?rev=27313&r1=27312&r2=27313&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_crm/bt/template_catalog_related_key_list [utf8] (original)
+++ erp5/trunk/bt5/erp5_crm/bt/template_catalog_related_key_list [utf8] Mon Jun 1 15:38:30 2009
@@ -3,4 +3,5 @@
related_source_or_destination | category,catalog,catalog/uid/z_related_source_or_destination
related_source_section_or_destination_section | category,catalog,catalog/uid/z_related_source_section_or_destination_section
related_source_decision_or_destination_decision | category,catalog,catalog/uid/z_related_source_decision_or_destination_decision
-related_source_or_source_decision_or_destination_or_destination_decision | category,catalog,catalog/uid/z_related_source_or_source_decision_or_destination_or_destination_decision
+related_source_or_source_decision_or_destination_or_destination_decision | category,catalog,catalog/uid/z_related_source_or_source_decision_or_destination_or_destination_decision
+related_source_or_source_section_or_destination_or_destination_section | category,catalog,catalog/uid/z_related_source_or_source_section_or_destination_or_destination_section
More information about the Erp5-report
mailing list