From e1511b0fbc90ce8c7a6e495557c1dc293b9217ae Mon Sep 17 00:00:00 2001
From: Romain Courteaud <romain@nexedi.com>
Date: Thu, 7 Dec 2017 15:00:25 +0000
Subject: [PATCH] [erp5_web_renderjs_ui] Keep the search query when changing
url parameter
This allow to go to dialog page on a module, and keep the search parameter.
---
.../web_page_module/rjs_gadget_erp5_router_js.js | 3 ++-
.../rjs_gadget_erp5_router_js.xml | 6 +++---
.../testPageActionBackLinkOnModule.zpt | 16 +++++++++++++++-
3 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_router_js.js b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_router_js.js
index 8a8110877d..524397c389 100644
--- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_router_js.js
+++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_router_js.js
@@ -636,7 +636,8 @@
view: command_options.args.view || 'view',
selection: command_options.args.selection,
selection_index: command_options.args.selection_index,
- history: command_options.args.history
+ history: command_options.args.history,
+ extended_search: command_options.args.extended_search
})
);
});
diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_router_js.xml b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_router_js.xml
index 4a9e08d7c9..42f11aa71c 100644
--- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_router_js.xml
+++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_router_js.xml
@@ -218,7 +218,7 @@
</item>
<item>
<key> <string>actor</string> </key>
- <value> <string>vincent</string> </value>
+ <value> <string>zope</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
@@ -232,7 +232,7 @@
</item>
<item>
<key> <string>serial</string> </key>
- <value> <string>963.17770.52424.63095</string> </value>
+ <value> <string>963.63967.25463.60364</string> </value>
</item>
<item>
<key> <string>state</string> </key>
@@ -250,7 +250,7 @@
</tuple>
<state>
<tuple>
- <float>1509973413.87</float>
+ <float>1512658596.82</float>
<string>UTC</string>
</tuple>
</state>
diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageActionBackLinkOnModule.zpt b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageActionBackLinkOnModule.zpt
index 7e73333df9..c8164cdf6b 100644
--- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageActionBackLinkOnModule.zpt
+++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageActionBackLinkOnModule.zpt
@@ -13,11 +13,21 @@
<tr>
<td>open</td>
- <td>${base_url}/web_site_module/renderjs_runner/#/foo_module?page=action</td>
+ <td>${base_url}/web_site_module/renderjs_runner/#/foo_module</td>
<td></td>
</tr>
+<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded" />
+
+<tal:block tal:define="search_query python: 'foo:"bar" AND barfoo'">
+ <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/search_in_form_list" />
+</tal:block>
<!-- Wait for gadget to be loaded -->
+<tr>
+ <td>click</td>
+ <td>//div[@data-gadget-scope='header']//a[text()='Actions' and contains(@href, '#!change') and contains(@href, 'n.page=action')]</td>
+ <td></td>
+</tr>
<tr>
<td>waitForElementPresent</td>
<td>//div[@data-gadget-url='${base_url}/web_site_module/renderjs_runner/gadget_erp5_page_action.html']</td>
@@ -52,6 +62,10 @@
<td>Foos</td>
<td></td>
</tr>
+<tal:block tal:define="parsed_query python: 'foo: "bar"';
+ search_query python: 'barfoo'">
+ <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/check_search_in_form_list" />
+</tal:block>
</tbody></table>
</body>
--
2.30.9