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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Matevz Golob
erp5
Commits
d878161c
Commit
d878161c
authored
Dec 27, 2017
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[erp5_web_renderjs_ui] Sortable columns do not need to be a visible column
parent
4cd7386c
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
6 deletions
+21
-6
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
+2
-2
bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testSortItemSelectable.zpt
...ests/renderjs_ui_listbox_zuite/testSortItemSelectable.zpt
+17
-2
bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_translate_zuite/testSortEditor.zpt
...rtal_tests/renderjs_ui_translate_zuite/testSortEditor.zpt
+1
-1
No files found.
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_js.js
View file @
d878161c
...
@@ -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
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_js.xml
View file @
d878161c
...
@@ -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.25
442.10691.601
42
</string>
</value>
<value>
<string>
964.25
791.46697.423
42
</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>
15143
00142.6
8
</float>
<float>
15143
75384.
8
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testSortItemSelectable.zpt
View file @
d878161c
...
@@ -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>
...
...
bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_translate_zuite/testSortEditor.zpt
View file @
d878161c
...
@@ -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>
...
...
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