From 5d0d9c1e6800875d35e4a9d4b85454feb0dc26e9 Mon Sep 17 00:00:00 2001 From: Yusei Tahara <yusei@nexedi.com> Date: Fri, 15 Feb 2008 16:52:58 +0000 Subject: [PATCH] Prevent to apply join to None. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@19335 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../listbox_destination_title.xml | 22 +++++++------------ .../Ticket_view/listbox_destination_title.xml | 22 +++++++------------ bt5/erp5_crm/bt/revision | 2 +- 3 files changed, 17 insertions(+), 29 deletions(-) diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/EventModule_viewEventList/listbox_destination_title.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/EventModule_viewEventList/listbox_destination_title.xml index ac1e15435e..597d546feb 100644 --- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/EventModule_viewEventList/listbox_destination_title.xml +++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/EventModule_viewEventList/listbox_destination_title.xml @@ -3,11 +3,8 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <tuple> - <string>Products.ERP5Form.ProxyField</string> - <string>ProxyField</string> - </tuple> - <none/> + <global name="ProxyField" module="Products.ERP5Form.ProxyField"/> + <tuple/> </tuple> </pickle> <pickle> @@ -100,11 +97,11 @@ <value> <dictionary> <item> - <key> <string>default</string> </key> + <key> <string>default</string> </key> <value> <string></string> </value> </item> <item> - <key> <string>editable</string> </key> + <key> <string>editable</string> </key> <value> <int>0</int> </value> </item> <item> @@ -120,7 +117,7 @@ <value> <string>Click to edit the target</string> </value> </item> <item> - <key> <string>title</string> </key> + <key> <string>title</string> </key> <value> <string>Recipients</string> </value> </item> </dictionary> @@ -132,18 +129,15 @@ <record id="2" aka="AAAAAAAAAAI="> <pickle> <tuple> - <tuple> - <string>Products.Formulator.TALESField</string> - <string>TALESMethod</string> - </tuple> - <none/> + <global name="TALESMethod" module="Products.Formulator.TALESField"/> + <tuple/> </tuple> </pickle> <pickle> <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>python:" / ".join(cell.getDestinationTitleList())</string> </value> + <value> <string>python:" / ".join(cell.getDestinationTitleList([]))</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/listbox_destination_title.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/listbox_destination_title.xml index ac1e15435e..597d546feb 100644 --- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/listbox_destination_title.xml +++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/listbox_destination_title.xml @@ -3,11 +3,8 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <tuple> - <string>Products.ERP5Form.ProxyField</string> - <string>ProxyField</string> - </tuple> - <none/> + <global name="ProxyField" module="Products.ERP5Form.ProxyField"/> + <tuple/> </tuple> </pickle> <pickle> @@ -100,11 +97,11 @@ <value> <dictionary> <item> - <key> <string>default</string> </key> + <key> <string>default</string> </key> <value> <string></string> </value> </item> <item> - <key> <string>editable</string> </key> + <key> <string>editable</string> </key> <value> <int>0</int> </value> </item> <item> @@ -120,7 +117,7 @@ <value> <string>Click to edit the target</string> </value> </item> <item> - <key> <string>title</string> </key> + <key> <string>title</string> </key> <value> <string>Recipients</string> </value> </item> </dictionary> @@ -132,18 +129,15 @@ <record id="2" aka="AAAAAAAAAAI="> <pickle> <tuple> - <tuple> - <string>Products.Formulator.TALESField</string> - <string>TALESMethod</string> - </tuple> - <none/> + <global name="TALESMethod" module="Products.Formulator.TALESField"/> + <tuple/> </tuple> </pickle> <pickle> <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>python:" / ".join(cell.getDestinationTitleList())</string> </value> + <value> <string>python:" / ".join(cell.getDestinationTitleList([]))</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_crm/bt/revision b/bt5/erp5_crm/bt/revision index 4b9bce4823..d7019ae2ee 100644 --- a/bt5/erp5_crm/bt/revision +++ b/bt5/erp5_crm/bt/revision @@ -1 +1 @@ -148 \ No newline at end of file +149 \ No newline at end of file -- 2.30.9