Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Nicolas Wavrant
erp5
Commits
4e73332b
Commit
4e73332b
authored
Dec 26, 2017
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[erp5_web_renderjs_ui] Searchable columns do not need to be a visible column
parent
15e527d7
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
28 additions
and
14 deletions
+28
-14
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_js.js
...emplateItem/web_page_module/rjs_gadget_erp5_listbox_js.js
+1
-1
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_js.xml
...mplateItem/web_page_module/rjs_gadget_erp5_listbox_js.xml
+8
-2
bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testFilterItemSelectable.zpt
...ts/renderjs_ui_listbox_zuite/testFilterItemSelectable.zpt
+19
-11
No files found.
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_js.js
View file @
4e73332b
...
...
@@ -193,7 +193,7 @@
// use only visible columns for search
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
;
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_js.xml
View file @
4e73332b
...
...
@@ -75,6 +75,12 @@
<none/>
</value>
</item>
<item>
<key>
<string>
content_type
</string>
</key>
<value>
<none/>
</value>
</item>
<item>
<key>
<string>
default_reference
</string>
</key>
<value>
<string>
gadget_erp5_field_listbox.js
</string>
</value>
...
...
@@ -236,7 +242,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
964.2
0125.49209.53111
</string>
</value>
<value>
<string>
964.2
5442.10691.60142
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -254,7 +260,7 @@
</tuple>
<state>
<tuple>
<float>
1514
279169.73
</float>
<float>
1514
300142.68
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testFilterItemSelectable.zpt
View file @
4e73332b
...
...
@@ -17,12 +17,22 @@
<td>
${base_url}/bar_module/ListBoxZuite_reset
</td>
<td></td>
</tr>
<tr>
<td>
assertTextPresent
</td>
<td>
Reset Successfully.
</td>
<td></td>
</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 -->
<tr>
...
...
@@ -33,13 +43,6 @@
<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>
<td>
waitForElementPresent
</td>
<td>
//div[@class='filter_item_container']//select
</td>
...
...
@@ -59,17 +62,22 @@
</tr>
<tr>
<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>
</tr>
<tr>
<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>
</tr>
<tr>
<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>
</tr>
<tr>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment