From de2f39bfa0faa4e3316181fec1fb106d5d045768 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com>
Date: Wed, 9 Dec 2009 10:20:45 +0000
Subject: [PATCH] Fix the use of 'cell' in tales, it was present with a None
value only because of a bug fixed in r31149.
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@31176 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../listbox_destination.xml | 25 +++----------------
.../listbox_mirror_node.xml | 4 +--
.../listbox_node.xml | 4 +--
.../listbox_destination_payment.xml | 9 +++----
bt5/erp5_accounting/bt/revision | 2 +-
5 files changed, 11 insertions(+), 33 deletions(-)
diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewDestinationAsset/listbox_destination.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewDestinationAsset/listbox_destination.xml
index 1c8a5ab83c..64b4fb7be3 100644
--- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewDestinationAsset/listbox_destination.xml
+++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewDestinationAsset/listbox_destination.xml
@@ -14,7 +14,6 @@
<value>
<list>
<string>title</string>
- <string>items</string>
</list>
</value>
</item>
@@ -65,13 +64,11 @@
<value> <string></string> </value>
</item>
<item>
- <key> <string>items</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
+ <key> <string>target</string> </key>
+ <value> <string></string> </value>
</item>
<item>
- <key> <string>target</string> </key>
+ <key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
@@ -103,20 +100,4 @@
</dictionary>
</pickle>
</record>
- <record id="2" aka="AAAAAAAAAAI=">
- <pickle>
- <tuple>
- <global name="TALESMethod" module="Products.Formulator.TALESField"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_text</string> </key>
- <value> <string>python:cell.getObject().AccountingTransactionLine_getNodeItemList(omit_filter=1)</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
</ZopeData>
diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewFieldLibrary/listbox_mirror_node.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewFieldLibrary/listbox_mirror_node.xml
index cc0418fd3f..83188e1d46 100644
--- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewFieldLibrary/listbox_mirror_node.xml
+++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewFieldLibrary/listbox_mirror_node.xml
@@ -13,8 +13,8 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
- <string>title</string>
<string>items</string>
+ <string>title</string>
</list>
</value>
</item>
@@ -124,7 +124,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python: (cell,context)[cell is None].getObject().AccountingTransactionLine_getNodeItemList(mirror=1)</string> </value>
+ <value> <string>python: CONTEXTS.get(\'cell\', context).getObject().AccountingTransactionLine_getNodeItemList(mirror=1)</string> </value>
</item>
</dictionary>
</pickle>
diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewFieldLibrary/listbox_node.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewFieldLibrary/listbox_node.xml
index c6459832a0..8daf5ccda3 100644
--- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewFieldLibrary/listbox_node.xml
+++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewFieldLibrary/listbox_node.xml
@@ -13,8 +13,8 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
- <string>title</string>
<string>items</string>
+ <string>title</string>
</list>
</value>
</item>
@@ -124,7 +124,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python: (cell,context)[cell is None].getObject().AccountingTransactionLine_getNodeItemList()</string> </value>
+ <value> <string>python: CONTEXTS.get(\'cell\', context).getObject().AccountingTransactionLine_getNodeItemList()</string> </value>
</item>
</dictionary>
</pickle>
diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/BalanceTransaction_view/listbox_destination_payment.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/BalanceTransaction_view/listbox_destination_payment.xml
index 58a1e9a5f8..8a1e74e8df 100644
--- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/BalanceTransaction_view/listbox_destination_payment.xml
+++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/BalanceTransaction_view/listbox_destination_payment.xml
@@ -267,18 +267,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: cell.getObject().AccountingTransaction_getDestinationPaymentItemList()</string> </value>
+ <value> <string>python: context.AccountingTransaction_getDestinationPaymentItemList()</string> </value>
</item>
</dictionary>
</pickle>
diff --git a/bt5/erp5_accounting/bt/revision b/bt5/erp5_accounting/bt/revision
index 20f199ae39..168072b7c6 100644
--- a/bt5/erp5_accounting/bt/revision
+++ b/bt5/erp5_accounting/bt/revision
@@ -1 +1 @@
-1075
\ No newline at end of file
+1076
\ No newline at end of file
--
2.30.9