diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_sorteditor_js.js b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_sorteditor_js.js index 4d216fae4789861165542c060d6b4b7539ee8bb2..ebb87d811bbc0137f4396904100e1535314b02b3 100644 --- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_sorteditor_js.js +++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_sorteditor_js.js @@ -156,7 +156,7 @@ options[gadget.props.key] = sort_query; } return gadget.redirect({ - command: 'change', + command: 'store_and_change', options: options }); } diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_sorteditor_js.xml b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_sorteditor_js.xml index c7c2b84f73ae77b8b2391514908825e7b4cf37a3..638bfca4ef48531724318cfadbcb5867221a4a00 100644 --- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_sorteditor_js.xml +++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_sorteditor_js.xml @@ -230,7 +230,7 @@ </item> <item> <key> <string>serial</string> </key> - <value> <string>947.5019.42413.48452</string> </value> + <value> <string>949.63919.28849.11281</string> </value> </item> <item> <key> <string>state</string> </key> @@ -248,7 +248,7 @@ </tuple> <state> <tuple> - <float>1447417043.95</float> + <float>1458739459.09</float> <string>UTC</string> </tuple> </state> diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormListSortStoreState.xml b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormListSortStoreState.xml new file mode 100644 index 0000000000000000000000000000000000000000..3a3d86d0d7928a61c505812554f42541bbf25a44 --- /dev/null +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormListSortStoreState.xml @@ -0,0 +1,58 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_bind_names</string> </key> + <value> + <object> + <klass> + <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/> + </klass> + <tuple/> + <state> + <dictionary> + <item> + <key> <string>_asgns</string> </key> + <value> + <dictionary> + <item> + <key> <string>name_subpath</string> </key> + <value> <string>traverse_subpath</string> </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </state> + </object> + </value> + </item> + <item> + <key> <string>content_type</string> </key> + <value> <string>text/html</string> </value> + </item> + <item> + <key> <string>expand</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>testFormListSortStoreState</string> </value> + </item> + <item> + <key> <string>output_encoding</string> </key> + <value> <string>utf-8</string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <unicode></unicode> </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormListSortStoreState.zpt b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormListSortStoreState.zpt new file mode 100644 index 0000000000000000000000000000000000000000..d66875053ac5f548b30ef47c3198f96f738e8caf --- /dev/null +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormListSortStoreState.zpt @@ -0,0 +1,140 @@ +<html xmlns:tal="http://xml.zope.org/namespaces/tal" + xmlns:metal="http://xml.zope.org/namespaces/metal"> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> +<title>Test Form List Search Action</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">Test Default Module View</td></tr> +</thead><tbody> +<tal:block metal:use-macro="here/Zuite_CommonTemplate/macros/init" /> + +<!-- Clean Up and prepare documents --> +<tr> + <td>open</td> + <td>${base_url}/foo_module/ListBoxZuite_reset</td> + <td></td> +</tr> +<tr> + <td>assertTextPresent</td> + <td>Reset Successfully.</td> + <td></td> +</tr> +<tr> + <td>open</td> + <td>${base_url}/foo_module/Zuite_waitForActivities</td> + <td></td> +</tr> +<tr> + <td>assertTextPresent</td> + <td>Done.</td> + <td></td> +</tr> + +<!-- Initialize --> +<tr> + <td>open</td> + <td>${base_url}/web_site_module/renderjs_runner/#/foo_module</td> + <td></td> +</tr> + +<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/clear_query" /> + +<!-- Sort by anything --> +<tr> + <td>waitForElementPresent</td> + <td>//button[@data-i18n='Sort']</td> + <td></td> +</tr> + +<tr> + <td>click</td> + <td>//button[@data-i18n='Sort']</td> + <td></td> +</tr> + +<tr> + <td>waitForElementPresent</td> + <td>//form[@class='plus']</td> + <td></td> +</tr> + + + +<tr> + <td>click</td> + <td>//form[@class='plus']//button</td> + <td></td> +</tr> + + +<tr> + <td>waitForElementPresent</td> + <td>//div[@class='sort_item_container ui-controlgroup ui-corner_all']/div[1]</td> + <td></td> +</tr> + +<tr> + <td>select</td> + <td>//div[@class='sort_item_container ui-controlgroup ui-corner_all']/div[1]/div[2]//select</td> + <td>index=0</td> +</tr> + +<tr> + <td>click</td> + <td>//form[@class="submit"]//button</td> + <td></td> +</tr> + +<tr> + <td>waitForElementPresent</td> + <td>//a[@class="responsive ui-btn ui-icon-spinner ui-btn-icon-left ui-first-child ui-last-child ui-disabled ui-icon-spin"]</td> + <td></td> +</tr> + +<tr> + <td>waitForElementNotPresent</td> + <td>//a[@class="responsive ui-btn ui-icon-spinner ui-btn-icon-left ui-first-child ui-last-child ui-disabled ui-icon-spin"]</td> + <td></td> +</tr> + +<!-- go back to module from stored state --> +<tr> + <td>open</td> + <td>${base_url}/foo_module/Zuite_waitForActivities</td> + <td></td> +</tr> +<tr> + <td>assertTextPresent</td> + <td>Done.</td> + <td></td> +</tr> +<tr> + <td>open</td> + <td>${base_url}/web_site_module/renderjs_runner/#!display_stored_state?p.page=front&n.jio_key=foo_module</td> + <td></td> +</tr> + +<tr> + <td>waitForElementPresent</td> + <td>//button[@data-i18n='Sort']</td> + <td></td> +</tr> + +<tr> + <td>click</td> + <td>//button[@data-i18n='Sort']</td> + <td></td> +</tr> + +<tr> + <td>waitForElementPresent</td> + <td>//div[@class='sort_item_container ui-controlgroup ui-corner_all']//button</td> + <td></td> +</tr> + +</tbody></table> +</body> +</html> \ No newline at end of file