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
Sebastian
erp5
Commits
fd47d130
Commit
fd47d130
authored
Jul 21, 2017
by
Tomáš Peterka
Committed by
Romain Courteaud
Jul 25, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[renderjs_ui] ListBox has clickable column names which issue sorting
parent
82c5ae6f
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
75 additions
and
36 deletions
+75
-36
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_html.html
...ateItem/web_page_module/rjs_gadget_erp5_listbox_html.html
+5
-1
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_html.xml
...lateItem/web_page_module/rjs_gadget_erp5_listbox_html.xml
+2
-2
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
+56
-29
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/PathTemplateItem/web_page_module/rjs_gadget_erp5_nojqm_css.css
...emplateItem/web_page_module/rjs_gadget_erp5_nojqm_css.css
+4
-0
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_nojqm_css.xml
...emplateItem/web_page_module/rjs_gadget_erp5_nojqm_css.xml
+2
-2
bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui/erp5css.less.txt
...teItem/portal_skins/erp5_web_renderjs_ui/erp5css.less.txt
+4
-0
No files found.
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_html.html
View file @
fd47d130
...
@@ -28,7 +28,11 @@
...
@@ -28,7 +28,11 @@
<
th
data
-
i18n
=
"
Jump
"
>
Jump
<
/th
>
<
th
data
-
i18n
=
"
Jump
"
>
Jump
<
/th
>
{{
/
if
}}
{{
/
if
}}
{{
#
each
head_value
}}
{{
#
each
head_value
}}
{{
#
if
sort_link
}}
<
th
class
=
"
{{class_value}}
"
><
a
href
=
"
{{sort_link}}
"
data
-
i18n
=
"
{{data-i18n}}
"
>
{{
text
}}
<
/a></
th
>
{{
else
}}
<
th
data
-
i18n
=
"
{{data-i18n}}
"
class
=
"
{{class_value}}
"
>
{{
text
}}
<
/th
>
<
th
data
-
i18n
=
"
{{data-i18n}}
"
class
=
"
{{class_value}}
"
>
{{
text
}}
<
/th
>
{{
/
if
}}
{{
/each}
}
{{
/each}
}
{{
#
if
line_icon
}}
{{
#
if
line_icon
}}
<
th
><
/th
>
<
th
><
/th
>
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_html.xml
View file @
fd47d130
...
@@ -234,7 +234,7 @@
...
@@ -234,7 +234,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
9
58.1079.25051.23586
</string>
</value>
<value>
<string>
9
60.57573.52830.63385
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -252,7 +252,7 @@
...
@@ -252,7 +252,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
1
489595378.88
</float>
<float>
1
500651800.2
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_js.js
View file @
fd47d130
...
@@ -267,11 +267,11 @@
...
@@ -267,11 +267,11 @@
.
onStateChange
(
function
(
modification_dict
)
{
.
onStateChange
(
function
(
modification_dict
)
{
var
gadget
=
this
,
var
gadget
=
this
,
head_value_list
=
[]
,
sort_key
=
gadget
.
state
.
key
+
"
_sort_list:json
"
,
class_value
,
class_value
,
sort_list
,
sort_list
,
column_list
,
column_list
,
tmp
,
sort_column_list
,
i
,
i
,
j
,
j
,
result_queue
=
new
RSVP
.
Queue
();
result_queue
=
new
RSVP
.
Queue
();
...
@@ -290,7 +290,7 @@
...
@@ -290,7 +290,7 @@
return
result_queue
return
result_queue
.
push
(
function
()
{
.
push
(
function
()
{
var
options
=
{
extended_search
:
undefined
};
var
options
=
{
extended_search
:
undefined
};
options
[
gadget
.
state
.
key
+
"
_sort_list:json
"
]
=
undefined
;
options
[
sort_key
]
=
undefined
;
return
gadget
.
getUrlFor
({
return
gadget
.
getUrlFor
({
command
:
'
store_and_change
'
,
command
:
'
store_and_change
'
,
options
:
options
options
:
options
...
@@ -314,38 +314,65 @@
...
@@ -314,38 +314,65 @@
(
modification_dict
.
hasOwnProperty
(
'
has_error
'
))
||
(
modification_dict
.
hasOwnProperty
(
'
has_error
'
))
||
(
modification_dict
.
hasOwnProperty
(
'
show_line_selector
'
))
||
(
modification_dict
.
hasOwnProperty
(
'
show_line_selector
'
))
||
(
modification_dict
.
hasOwnProperty
(
'
hide_sort
'
))
||
(
modification_dict
.
hasOwnProperty
(
'
hide_sort
'
))
||
(
modification_dict
.
hasOwnProperty
(
'
hide_class
'
)))
{
(
modification_dict
.
hasOwnProperty
(
'
hide_class
'
))
||
(
modification_dict
.
hasOwnProperty
(
'
extended_search
'
)))
{
// display sorting arrow inside correct columns
// display sorting arrow inside correct columns
sort_list
=
JSON
.
parse
(
gadget
.
state
.
sort_list_json
);
sort_list
=
JSON
.
parse
(
gadget
.
state
.
sort_list_json
);
// current sort
column_list
=
JSON
.
parse
(
gadget
.
state
.
column_list_json
);
column_list
=
JSON
.
parse
(
gadget
.
state
.
column_list_json
);
// shown columns
sort_column_list
=
JSON
.
parse
(
gadget
.
state
.
sort_column_list_json
);
// sortable columns
result_queue
.
push
(
function
()
{
// construct array of links for sortable columns, undefined otherwise
return
RSVP
.
all
(
column_list
.
map
(
function
(
column
)
{
function
is_current_column
(
item
)
{
return
item
[
0
]
===
column
[
0
];
}
var
is_sortable
=
sort_column_list
.
find
(
is_current_column
)
!==
undefined
,
current_sort
=
sort_list
.
find
(
is_current_column
),
options
=
{};
if
(
is_sortable
)
{
options
[
sort_key
]
=
[[
column
[
0
],
'
descending
'
]];
// make it the only new sort (replace array instead of push)
if
(
current_sort
!==
undefined
&&
current_sort
[
1
]
===
'
descending
'
)
{
options
[
sort_key
]
=
[[
column
[
0
],
'
ascending
'
]];
}
return
gadget
.
getUrlFor
({
"
command
"
:
'
store_and_change
'
,
"
options
"
:
options
});
}
return
undefined
;
}));
})
.
push
(
function
(
column_sort_link_list
)
{
// here we obtain links for sorting by columns
// so we can construct array of header objects to be rendered in the header template
var
hide_button_text
,
hide_button_name
,
current_sort
,
head_value_list
=
[];
for
(
i
=
0
;
i
<
column_list
.
length
;
i
+=
1
)
{
for
(
i
=
0
;
i
<
column_list
.
length
;
i
+=
1
)
{
class_value
=
""
;
current_sort
=
sort_list
.
find
((
item
)
=>
item
[
0
]
===
column_list
[
i
][
0
])
;
for
(
j
=
0
;
j
<
sort_list
.
length
;
j
+=
1
)
{
class_value
=
undefined
;
tmp
=
sort_list
[
j
];
if
(
tmp
[
0
]
===
column_list
[
i
][
0
]
)
{
if
(
current_sort
!==
undefined
)
{
if
(
tmp
[
1
]
===
"
ascending
"
)
{
if
(
current_sort
[
1
]
===
'
ascending
'
)
{
class_value
=
"
ui-icon ui-icon-arrow-up
"
;
class_value
=
"
ui-icon ui-icon-arrow-up
"
;
}
else
{
class_value
=
"
ui-icon ui-icon-arrow-down
"
;
}
}
break
;
if
(
current_sort
[
1
]
===
'
descending
'
)
{
class_value
=
"
ui-icon ui-icon-arrow-down
"
;
}
}
}
}
head_value_list
.
push
({
head_value_list
.
push
({
"
data-i18n
"
:
column_list
[
i
][
1
],
"
data-i18n
"
:
column_list
[
i
][
1
],
"
class_value
"
:
class_value
,
"
class_value
"
:
class_value
,
"
sort_link
"
:
column_sort_link_list
[
i
],
"
text
"
:
column_list
[
i
][
1
]
"
text
"
:
column_list
[
i
][
1
]
});
});
}
}
result_queue
.
push
(
function
()
{
var
listbox_thead_template
,
hide_button_text
,
hide_button_name
;
if
(
gadget
.
state
.
show_line_selector
)
{
if
(
gadget
.
state
.
show_line_selector
)
{
hide_button_text
=
'
Submit
'
;
hide_button_text
=
'
Submit
'
;
hide_button_name
=
'
SelectRows
'
;
hide_button_name
=
'
SelectRows
'
;
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_js.xml
View file @
fd47d130
...
@@ -236,7 +236,7 @@
...
@@ -236,7 +236,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
960.5
3125.56977.8192
</string>
</value>
<value>
<string>
960.5
6198.53416.29457
</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>
1500
458423.03
</float>
<float>
1500
626843.31
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_nojqm_css.css
View file @
fd47d130
...
@@ -1216,6 +1216,10 @@ div[data-gadget-scope='erp5_searchfield'] button {
...
@@ -1216,6 +1216,10 @@ div[data-gadget-scope='erp5_searchfield'] button {
background-color
:
#0E81C2
;
background-color
:
#0E81C2
;
color
:
#FFFFFF
;
color
:
#FFFFFF
;
}
}
.document_table
table
thead
a
{
color
:
#FFFFFF
;
text-decoration
:
underline
;
}
.document_table
table
thead
tr
th
{
.document_table
table
thead
tr
th
{
padding
:
6pt
3pt
;
padding
:
6pt
3pt
;
}
}
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_nojqm_css.xml
View file @
fd47d130
...
@@ -242,7 +242,7 @@
...
@@ -242,7 +242,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
960.
1037.21083.19336
</string>
</value>
<value>
<string>
960.
55964.9157.39662
</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>
1
497443563.95
</float>
<float>
1
500555425.98
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui/erp5css.less.txt
View file @
fd47d130
...
@@ -1396,6 +1396,10 @@ div[data-gadget-scope='erp5_searchfield'] {
...
@@ -1396,6 +1396,10 @@ div[data-gadget-scope='erp5_searchfield'] {
background-color: @colorsubheaderbackground;
background-color: @colorsubheaderbackground;
color: @white;
color: @white;
a {
color: @white;
text-decoration: underline;
}
// XXX Same than cells
// XXX Same than cells
tr { th {
tr { th {
...
...
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