Commit 4e73332b authored by Romain Courteaud's avatar Romain Courteaud

[erp5_web_renderjs_ui] Searchable columns do not need to be a visible column

parent 15e527d7
...@@ -193,7 +193,7 @@ ...@@ -193,7 +193,7 @@
// use only visible columns for search // use only visible columns for search
if (field_json.search_column_list.length) { if (field_json.search_column_list.length) {
search_column_list = field_json.search_column_list.filter(is_in_column_list); search_column_list = field_json.search_column_list;
} }
url_query = options.extended_search; url_query = options.extended_search;
......
...@@ -75,6 +75,12 @@ ...@@ -75,6 +75,12 @@
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>content_type</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>default_reference</string> </key> <key> <string>default_reference</string> </key>
<value> <string>gadget_erp5_field_listbox.js</string> </value> <value> <string>gadget_erp5_field_listbox.js</string> </value>
...@@ -236,7 +242,7 @@ ...@@ -236,7 +242,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>964.20125.49209.53111</string> </value> <value> <string>964.25442.10691.60142</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -254,7 +260,7 @@ ...@@ -254,7 +260,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1514279169.73</float> <float>1514300142.68</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -17,12 +17,22 @@ ...@@ -17,12 +17,22 @@
<td>${base_url}/bar_module/ListBoxZuite_reset</td> <td>${base_url}/bar_module/ListBoxZuite_reset</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>assertTextPresent</td> <td>assertTextPresent</td>
<td>Reset Successfully.</td> <td>Reset Successfully.</td>
<td></td> <td></td>
</tr> </tr>
<!-- Set all_columns property -->
<tr>
<td>open</td>
<td>${base_url}/foo_module/FooModule_viewFooList/listbox/ListBox_setPropertyList?field_all_columns=creation_date%7CCreation%20Date%0AgetUid%7CUID%0Adelivery.quantity%7CQuantity</td>
<td></td>
</tr>
<tr>
<td>assertTextPresent</td>
<td>Set Successfully.</td>
<td></td>
</tr>
<!-- Initialize --> <!-- Initialize -->
<tr> <tr>
...@@ -33,13 +43,6 @@ ...@@ -33,13 +43,6 @@
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/triggle_filter_and" /> <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/triggle_filter_and" />
<!-- No item is displayed -->
<!--tr>
<td>assertElementNotPresent</td>
<td>//div[@class='filter_item_container']/div</td>
<td></td>
</tr-->
<tr> <tr>
<td>waitForElementPresent</td> <td>waitForElementPresent</td>
<td>//div[@class='filter_item_container']//select</td> <td>//div[@class='filter_item_container']//select</td>
...@@ -59,17 +62,22 @@ ...@@ -59,17 +62,22 @@
</tr> </tr>
<tr> <tr>
<td>assertElementPresent</td> <td>assertElementPresent</td>
<td>//div[@class='filter_item_container']/div[1]//select[1]//option[3][@value='TEXT' and text()='Searchable Text']</td> <td>//div[@class='filter_item_container']/div[1]//select[1]//option[3][@value='COLUMN_creation_date' and text()='Creation Date']</td>
<td></td>
</tr>
<tr>
<td>assertElementPresent</td>
<td>//div[@class='filter_item_container']/div[1]//select[1]//option[4][@value='TEXT' and text()='Searchable Text']</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>assertElementPresent</td> <td>assertElementPresent</td>
<td>//div[@class='filter_item_container']/div[1]//select[1]//option[4][@value='RAW' and text()='Search Expression']</td> <td>//div[@class='filter_item_container']/div[1]//select[1]//option[5][@value='RAW' and text()='Search Expression']</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>assertElementNotPresent</td> <td>assertElementNotPresent</td>
<td>//div[@class='filter_item_container']/div[1]//select[1]//option[5]</td> <td>//div[@class='filter_item_container']/div[1]//select[1]//option[6]</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
......
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