Commit d878161c authored by Romain Courteaud's avatar Romain Courteaud

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

parent 4cd7386c
...@@ -188,7 +188,7 @@ ...@@ -188,7 +188,7 @@
// use only visible columns for sort // use only visible columns for sort
if (field_json.sort_column_list.length) { if (field_json.sort_column_list.length) {
sort_column_list = field_json.sort_column_list.filter(is_in_column_list); sort_column_list = field_json.sort_column_list;
} }
// use only visible columns for search // use only visible columns for search
......
...@@ -242,7 +242,7 @@ ...@@ -242,7 +242,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>964.25442.10691.60142</string> </value> <value> <string>964.25791.46697.42342</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -260,7 +260,7 @@ ...@@ -260,7 +260,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1514300142.68</float> <float>1514375384.8</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>
...@@ -63,9 +73,14 @@ ...@@ -63,9 +73,14 @@
<td>//div[@class='sort_item_container ui-controlgroup ui-corner_all']/div[1]//select[1]//option[2][@value='title' and text()='Title']</td> <td>//div[@class='sort_item_container ui-controlgroup ui-corner_all']/div[1]//select[1]//option[2][@value='title' and text()='Title']</td>
<td></td> <td></td>
</tr> </tr>
<tr>
<td>assertElementPresent</td>
<td>//div[@class='sort_item_container ui-controlgroup ui-corner_all']/div[1]//select[1]//option[3][@value='creation_date' and text()='Creation Date']</td>
<td></td>
</tr>
<tr> <tr>
<td>assertElementNotPresent</td> <td>assertElementNotPresent</td>
<td>//div[@class='sort_item_container ui-controlgroup ui-corner_all']/div[1]//select[1]//option[3]</td> <td>//div[@class='sort_item_container ui-controlgroup ui-corner_all']/div[1]//select[1]//option[4]</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
......
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
<tr> <tr>
<td>verifySelectOptions</td> <td>verifySelectOptions</td>
<td>//div[@class='sort_item_container ui-controlgroup ui-corner_all']/div[1]//select[1]</td> <td>//div[@class='sort_item_container ui-controlgroup ui-corner_all']/div[1]//select[1]</td>
<td>ID,biaoti</td> <td>ID,biaoti,chuangjianshijian,xiugaishijian,shuoyouzhe</td>
</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