Skip to content

erp5
erp5
Commit 9d2d8e23 authored by Vincent Pelletier's avatar Vincent Pelletier
Browse files
Options

In Base_viewWorkflowHistory, grab selection name from request - if it's there... 

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.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@22013 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent ed2f760e
Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 42 deletions
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewWorkflowHistory/listbox.xml
View file @ 9d2d8e23
...@@ -3,11 +3,8 @@ ...@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
<string>Products.ERP5Form.ProxyField</string> <tuple/>
<string>ProxyField</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
...@@ -16,23 +13,13 @@ ...@@ -16,23 +13,13 @@
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list>
<string>editable_permission</string>
<string>lines</string>
<string>viewable_permission</string>
<string>read_only</string>
<string>title</string> <string>title</string>
<string>selection_name</string>
<string>columns</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>list_method</string>
<string>editable_role</string> <string>selection_name</string>
<string>list_action</string>
<string>url_columns</string>
<string>disable_link</string>
<string>editable_columns</string> <string>editable_columns</string>
<string>url_columns</string>
<string>list_action</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -74,6 +61,14 @@ ...@@ -74,6 +61,14 @@
<key> <string>tales</string> </key> <key> <string>tales</string> </key>
<value> <value>
<dictionary> <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> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -82,16 +77,32 @@ ...@@ -82,16 +77,32 @@
<key> <string>form_id</string> </key> <key> <string>form_id</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </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> <item>
<key> <string>target</string> </key> <key> <string>target</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value> </value>
</item> </item>
<item>
<key> <string>url_columns</string> </key>
<value> <string></string> </value>
</item>
</dictionary> </dictionary>
</value> </value>
</item> </item>
...@@ -110,7 +121,7 @@ ...@@ -110,7 +121,7 @@
</value> </value>
</item> </item>
<item> <item>
<key> <string>columns</string> </key> <key> <string>columns</string> </key>
<value> <value>
<list> <list>
<tuple> <tuple>
...@@ -145,7 +156,7 @@ ...@@ -145,7 +156,7 @@
<value> <int>0</int> </value> <value> <int>0</int> </value>
</item> </item>
<item> <item>
<key> <string>editable_columns</string> </key> <key> <string>editable_columns</string> </key>
<value> <value>
<list> <list>
<tuple> <tuple>
...@@ -176,15 +187,11 @@ ...@@ -176,15 +187,11 @@
<value> <string>Base_viewFieldLibrary</string> </value> <value> <string>Base_viewFieldLibrary</string> </value>
</item> </item>
<item> <item>
<key> <string>lines</string> </key> <key> <string>list_action</string> </key>
<value> <int>600</int> </value>
</item>
<item>
<key> <string>list_action</string> </key>
<value> <string>Folder_viewContentList</string> </value> <value> <string>Folder_viewContentList</string> </value>
</item> </item>
<item> <item>
<key> <string>list_method</string> </key> <key> <string>list_method</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value> </value>
...@@ -198,7 +205,7 @@ ...@@ -198,7 +205,7 @@
<value> <int>0</int> </value> <value> <int>0</int> </value>
</item> </item>
<item> <item>
<key> <string>selection_name</string> </key> <key> <string>selection_name</string> </key>
<value> <string>base_workflow_history_selection</string> </value> <value> <string>base_workflow_history_selection</string> </value>
</item> </item>
<item> <item>
...@@ -206,11 +213,11 @@ ...@@ -206,11 +213,11 @@
<value> <string>Click to edit the target</string> </value> <value> <string>Click to edit the target</string> </value>
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Workflow History</string> </value> <value> <string>Workflow History</string> </value>
</item> </item>
<item> <item>
<key> <string>url_columns</string> </key> <key> <string>url_columns</string> </key>
<value> <value>
<list> <list>
<tuple> <tuple>
...@@ -261,18 +268,15 @@ ...@@ -261,18 +268,15 @@
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="TALESMethod" module="Products.Formulator.TALESField"/>
<string>Products.Formulator.TALESField</string> <tuple/>
<string>TALESMethod</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <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> </item>
</dictionary> </dictionary>
</pickle> </pickle>
...@@ -280,11 +284,8 @@ ...@@ -280,11 +284,8 @@
<record id="3" aka="AAAAAAAAAAM="> <record id="3" aka="AAAAAAAAAAM=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="Method" module="Products.Formulator.MethodField"/>
<string>Products.Formulator.MethodField</string> <tuple/>
<string>Method</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7