Commit e1511b0f authored by Romain Courteaud's avatar Romain Courteaud

[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.
parent 9d433480
...@@ -636,7 +636,8 @@ ...@@ -636,7 +636,8 @@
view: command_options.args.view || 'view', view: command_options.args.view || 'view',
selection: command_options.args.selection, selection: command_options.args.selection,
selection_index: command_options.args.selection_index, selection_index: command_options.args.selection_index,
history: command_options.args.history history: command_options.args.history,
extended_search: command_options.args.extended_search
}) })
); );
}); });
......
...@@ -218,7 +218,7 @@ ...@@ -218,7 +218,7 @@
</item> </item>
<item> <item>
<key> <string>actor</string> </key> <key> <string>actor</string> </key>
<value> <string>vincent</string> </value> <value> <string>zope</string> </value>
</item> </item>
<item> <item>
<key> <string>comment</string> </key> <key> <string>comment</string> </key>
...@@ -232,7 +232,7 @@ ...@@ -232,7 +232,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>963.17770.52424.63095</string> </value> <value> <string>963.63967.25463.60364</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -250,7 +250,7 @@ ...@@ -250,7 +250,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1509973413.87</float> <float>1512658596.82</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -13,11 +13,21 @@ ...@@ -13,11 +13,21 @@
<tr> <tr>
<td>open</td> <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> <td></td>
</tr> </tr>
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded" />
<tal:block tal:define="search_query python: 'foo:&#34;bar&#34; AND barfoo'">
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/search_in_form_list" />
</tal:block>
<!-- Wait for gadget to be loaded --> <!-- 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> <tr>
<td>waitForElementPresent</td> <td>waitForElementPresent</td>
<td>//div[@data-gadget-url='${base_url}/web_site_module/renderjs_runner/gadget_erp5_page_action.html']</td> <td>//div[@data-gadget-url='${base_url}/web_site_module/renderjs_runner/gadget_erp5_page_action.html']</td>
...@@ -52,6 +62,10 @@ ...@@ -52,6 +62,10 @@
<td>Foos</td> <td>Foos</td>
<td></td> <td></td>
</tr> </tr>
<tal:block tal:define="parsed_query python: 'foo:&nbsp; &#34;bar&#34;';
search_query python: 'barfoo'">
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/check_search_in_form_list" />
</tal:block>
</tbody></table> </tbody></table>
</body> </body>
......
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