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
Labels
Merge Requests
138
Merge Requests
138
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
Jobs
Commits
Open sidebar
nexedi
erp5
Commits
a991b7e2
Commit
a991b7e2
authored
Aug 27, 2021
by
Gabriel Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_web_renderjs_ui: avoid duplicated options
parent
939ff733
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
26 deletions
+10
-26
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
+5
-19
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_graphic_js.js
...PathTemplateItem/web_page_module/rjs_gadget_graphic_js.js
+1
-3
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_graphic_js.xml
...athTemplateItem/web_page_module/rjs_gadget_graphic_js.xml
+2
-2
No files found.
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_js.js
View file @
a991b7e2
...
...
@@ -477,7 +477,8 @@
column_id
,
column_title
,
not_concatenated_list
=
[
field_json
.
column_list
,
(
field_json
.
all_column_list
||
[])],
option_list
=
field_json
.
domain_root_list
||
[];
option_list
=
field_json
.
domain_root_list
||
[],
key_list
=
[];
// Calculate the list of all displayable columns
for
(
i
=
0
;
i
<
not_concatenated_list
.
length
;
i
+=
1
)
{
...
...
@@ -509,7 +510,9 @@
for
(
i
=
0
;
i
<
not_concatenated_list
.
length
;
i
+=
1
)
{
for
(
j
=
0
;
j
<
not_concatenated_list
[
i
].
length
;
j
+=
1
)
{
if
(
not_concatenated_list
[
i
][
j
][
0
].
indexOf
(
"
_state
"
)
!==
-
1
)
{
if
(
not_concatenated_list
[
i
][
j
][
0
].
indexOf
(
"
_state
"
)
!==
-
1
&&
key_list
.
indexOf
(
not_concatenated_list
[
i
][
j
][
0
])
===
-
1
)
{
key_list
.
push
(
not_concatenated_list
[
i
][
j
][
0
]);
option_list
.
push
([
not_concatenated_list
[
i
][
j
][
0
],
not_concatenated_list
[
i
][
j
][
1
]
...
...
@@ -1210,22 +1213,6 @@
if
(
column_list_json
[
i
][
0
]
===
modification_dict
.
graphic_type
)
{
group_by
=
column_list_json
[
i
][
0
];
group_by_title
=
column_list_json
[
i
][
1
];
console
.
log
({
group_by
:
group_by
,
query_by
:
{},
title
:
group_by_title
,
list_method_template
:
gadget
.
state
.
list_method_template
,
list_method
:
gadget
.
state
.
list_method
,
layout
:
{
x
:
{
"
title
"
:
group_by_title
,
"
key
"
:
group_by
},
y
:
{
"
title
"
:
"
Quantity
"
}
}
});
return
graphic_gadget
.
render
({
group_by
:
group_by
,
query_by
:
{},
...
...
@@ -1543,7 +1530,6 @@
if
((
evt
.
target
.
type
===
'
button
'
)
&&
((
evt
.
target
.
name
===
'
SelectAction
'
)
||
(
evt
.
target
.
name
===
'
ClipboardAction
'
)))
{
console
.
log
(
"
I am here
"
);
evt
.
preventDefault
();
checked_uid_list
=
[];
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_js.xml
View file @
a991b7e2
...
...
@@ -240,7 +240,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
994.2
2784.37631.18722
</string>
</value>
<value>
<string>
994.2
5329.16170.62481
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -258,7 +258,7 @@
</tuple>
<state>
<tuple>
<float>
16
29990890.83
</float>
<float>
16
30077204.4
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_graphic_js.js
View file @
a991b7e2
...
...
@@ -138,7 +138,7 @@
}
}
}
console
.
log
(
select_list
,
[
data
.
y
,
options
.
layout
.
x
.
key
]);
select_list
=
select_list
.
concat
(
[
data
.
y
,
options
.
layout
.
x
.
key
].
filter
(
function
(
el
,
index
)
{
return
select_list
.
indexOf
(
el
)
!==
index
;
...
...
@@ -221,8 +221,6 @@
})
];
console
.
log
(
"
query
"
,
gadget
.
state
.
query
);
console
.
log
(
"
query_list
"
,
query_list
);
if
(
gadget
.
state
.
query
)
{
queue_list
.
push
(
gadget
.
jio_allDocs
(
gadget
.
state
.
query
));
}
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_graphic_js.xml
View file @
a991b7e2
...
...
@@ -246,7 +246,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
994.2
4186.33564.18483
</string>
</value>
<value>
<string>
994.2
5329.489.41745
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -264,7 +264,7 @@
</tuple>
<state>
<tuple>
<float>
16300
08647.86
</float>
<float>
16300
77214.53
</float>
<string>
UTC
</string>
</tuple>
</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