[Erp5-report] r22013 - in /erp5/trunk/products/ERP5/bootstrap/erp5_core: SkinTemplateItem/p...
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Jun 27 12:26:07 CEST 2008
Author: vincent
Date: Fri Jun 27 12:26:04 2008
New Revision: 22013
URL: http://svn.erp5.org?rev=22013&view=rev
Log:
In Base_viewWorkflowHistory, grab selection name from request - if it's there - when generating title. It is set by Report.py when the field is rendered in report mode.
Unharcode default selection name in title's TALES.
Modified:
erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewWorkflowHistory/listbox.xml
erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewWorkflowHistory/listbox.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewWorkflowHistory/listbox.xml?rev=22013&r1=22012&r2=22013&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewWorkflowHistory/listbox.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewWorkflowHistory/listbox.xml Fri Jun 27 12:26:04 2008
@@ -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>
@@ -16,23 +13,13 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
- <string>editable_permission</string>
- <string>lines</string>
- <string>viewable_permission</string>
- <string>read_only</string>
<string>title</string>
+ <string>columns</string>
+ <string>list_method</string>
<string>selection_name</string>
- <string>columns</string>
- <string>Base_viewSearchResultList</string>
- <string>all_editable_columns</string>
- <string>not_viewable</string>
- <string>viewable_role</string>
- <string>list_method</string>
- <string>editable_role</string>
+ <string>editable_columns</string>
+ <string>url_columns</string>
<string>list_action</string>
- <string>url_columns</string>
- <string>disable_link</string>
- <string>editable_columns</string>
</list>
</value>
</item>
@@ -75,6 +62,14 @@
<value>
<dictionary>
<item>
+ <key> <string>columns</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>editable_columns</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
@@ -83,14 +78,30 @@
<value> <string></string> </value>
</item>
<item>
+ <key> <string>list_action</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>list_method</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>selection_name</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>title</string> </key>
+ <key> <string>title</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
+ </item>
+ <item>
+ <key> <string>url_columns</string> </key>
+ <value> <string></string> </value>
</item>
</dictionary>
</value>
@@ -110,7 +121,7 @@
</value>
</item>
<item>
- <key> <string>columns</string> </key>
+ <key> <string>columns</string> </key>
<value>
<list>
<tuple>
@@ -145,7 +156,7 @@
<value> <int>0</int> </value>
</item>
<item>
- <key> <string>editable_columns</string> </key>
+ <key> <string>editable_columns</string> </key>
<value>
<list>
<tuple>
@@ -176,15 +187,11 @@
<value> <string>Base_viewFieldLibrary</string> </value>
</item>
<item>
- <key> <string>lines</string> </key>
- <value> <int>600</int> </value>
- </item>
- <item>
- <key> <string>list_action</string> </key>
+ <key> <string>list_action</string> </key>
<value> <string>Folder_viewContentList</string> </value>
</item>
<item>
- <key> <string>list_method</string> </key>
+ <key> <string>list_method</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
@@ -198,7 +205,7 @@
<value> <int>0</int> </value>
</item>
<item>
- <key> <string>selection_name</string> </key>
+ <key> <string>selection_name</string> </key>
<value> <string>base_workflow_history_selection</string> </value>
</item>
<item>
@@ -206,11 +213,11 @@
<value> <string>Click to edit the target</string> </value>
</item>
<item>
- <key> <string>title</string> </key>
+ <key> <string>title</string> </key>
<value> <string>Workflow History</string> </value>
</item>
<item>
- <key> <string>url_columns</string> </key>
+ <key> <string>url_columns</string> </key>
<value>
<list>
<tuple>
@@ -261,18 +268,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: here.portal_selections.getSelectionParams(\'base_workflow_history_selection\')[\'workflow_title\']</string> </value>
+ <value> <string>python: here.portal_selections.getSelectionParams(request.get(\'prefixed_selection_name\', field.get_orig_value(\'selection_name\')))[\'workflow_title\']</string> </value>
</item>
</dictionary>
</pickle>
@@ -280,11 +284,8 @@
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.MethodField</string>
- <string>Method</string>
- </tuple>
- <none/>
+ <global name="Method" module="Products.Formulator.MethodField"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision?rev=22013&r1=22012&r2=22013&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision Fri Jun 27 12:26:04 2008
@@ -1,1 +1,1 @@
-860
+861
More information about the Erp5-report
mailing list