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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Sven Franck
erp5
Commits
04939506
Commit
04939506
authored
Jul 21, 2017
by
Tomáš Peterka
Committed by
Tomáš Peterka
Jul 21, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[renderjs_ui] ListBox Field shows default sort in the header
parent
1bb79a39
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
32 additions
and
20 deletions
+32
-20
bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/ERP5Document_getHateoas.py
...rtal_skins/erp5_hal_json_style/ERP5Document_getHateoas.py
+1
-0
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
+29
-18
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
No files found.
bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/ERP5Document_getHateoas.py
View file @
04939506
...
@@ -429,6 +429,7 @@ def renderField(traversed_document, field, form_relative_url, value=None, meta_t
...
@@ -429,6 +429,7 @@ def renderField(traversed_document, field, form_relative_url, value=None, meta_t
"editable"
:
field
.
get_value
(
"editable"
),
"editable"
:
field
.
get_value
(
"editable"
),
"column_list"
:
column_list
,
"column_list"
:
column_list
,
"search_column_list"
:
search_column_list
,
"search_column_list"
:
search_column_list
,
"sort"
:
field
.
get_value
(
'sort'
),
"sort_column_list"
:
sort_column_list
,
"sort_column_list"
:
sort_column_list
,
"editable_column_list"
:
editable_column_list
,
"editable_column_list"
:
editable_column_list
,
"show_anchor"
:
field
.
get_value
(
"anchor"
),
"show_anchor"
:
field
.
get_value
(
"anchor"
),
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_js.js
View file @
04939506
...
@@ -159,27 +159,35 @@
...
@@ -159,27 +159,35 @@
url_query
,
url_query
,
queue
;
queue
;
//only display which is in listbox's column list
/** Transform sort arguments (column_name, sort_direction) to jIO's "ascending" and "descending" **/
if
(
field_json
.
sort_column_list
.
length
)
{
function
jioize_sort
(
column_sort
)
{
sort_column_list
=
field_json
.
sort_column_list
.
filter
(
function
(
n
)
{
if
(
column_sort
[
1
].
toLowerCase
().
startsWith
(
'
asc
'
))
{
for
(
i
=
0
;
i
<
field_json
.
column_list
.
length
;
i
+=
1
)
{
return
[
column_sort
[
0
],
'
ascending
'
];
if
(
field_json
.
column_list
[
i
][
0
]
===
n
[
0
]
&&
field_json
.
column_list
[
i
][
1
]
===
n
[
1
])
{
return
true
;
}
}
if
(
column_sort
[
1
].
toLowerCase
().
startsWith
(
'
desc
'
))
{
return
[
column_sort
[
0
],
'
descending
'
];
}
}
return
false
;
return
column_sort
;
});
}
}
if
(
field_json
.
search_column_list
.
length
)
{
/** Check whether item is in outer-scoped field_json.column_list */
search_column_list
=
field_json
.
search_column_list
.
filter
(
function
(
n
)
{
function
is_in_column_list
(
item
)
{
for
(
i
=
0
;
i
<
field_json
.
column_list
.
length
;
i
+=
1
)
{
for
(
i
=
0
;
i
<
field_json
.
column_list
.
length
;
i
+=
1
)
{
if
(
field_json
.
column_list
[
i
][
0
]
===
n
[
0
]
&&
field_json
.
column_list
[
i
][
1
]
===
n
[
1
])
{
if
(
field_json
.
column_list
[
i
][
0
]
===
item
[
0
]
&&
field_json
.
column_list
[
i
][
1
]
===
item
[
1
])
{
return
true
;
return
true
;
}
}
}
}
return
false
;
return
false
;
});
}
// use only visible columns for sort
if
(
field_json
.
sort_column_list
.
length
)
{
sort_column_list
=
field_json
.
sort_column_list
.
filter
(
is_in_column_list
);
}
// 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
.
push
([
"
searchable_text
"
,
"
Searchable Text
"
]);
search_column_list
.
push
([
"
searchable_text
"
,
"
Searchable Text
"
]);
...
@@ -227,7 +235,9 @@
...
@@ -227,7 +235,9 @@
editable
:
field_json
.
editable
,
editable
:
field_json
.
editable
,
begin_from
:
parseInt
(
result_list
[
0
]
||
'
0
'
,
10
)
||
0
,
begin_from
:
parseInt
(
result_list
[
0
]
||
'
0
'
,
10
)
||
0
,
sort_list_json
:
JSON
.
stringify
(
result_list
[
1
]
||
[]),
// sorting is either specified in URL per listbox or we take default sorting from JSON's 'sort' attribute
sort_list_json
:
JSON
.
stringify
(
result_list
[
1
]
||
field_json
.
sort
.
map
(
jioize_sort
)),
show_anchor
:
field_json
.
show_anchor
,
show_anchor
:
field_json
.
show_anchor
,
line_icon
:
field_json
.
line_icon
,
line_icon
:
field_json
.
line_icon
,
...
@@ -310,6 +320,7 @@
...
@@ -310,6 +320,7 @@
(
modification_dict
.
hasOwnProperty
(
'
hide_sort
'
))
||
(
modification_dict
.
hasOwnProperty
(
'
hide_sort
'
))
||
(
modification_dict
.
hasOwnProperty
(
'
hide_class
'
)))
{
(
modification_dict
.
hasOwnProperty
(
'
hide_class
'
)))
{
// display sorting arrow inside correct columns
sort_list
=
JSON
.
parse
(
gadget
.
state
.
sort_list_json
);
sort_list
=
JSON
.
parse
(
gadget
.
state
.
sort_list_json
);
column_list
=
JSON
.
parse
(
gadget
.
state
.
column_list_json
);
column_list
=
JSON
.
parse
(
gadget
.
state
.
column_list_json
);
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_js.xml
View file @
04939506
...
@@ -236,7 +236,7 @@
...
@@ -236,7 +236,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
9
58.1409.21281.2338
</string>
</value>
<value>
<string>
9
60.53125.56977.8192
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -254,7 +254,7 @@
...
@@ -254,7 +254,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
1
489590055.78
</float>
<float>
1
500458423.03
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
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