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
Léo-Paul Géneau
erp5
Commits
6cc5651e
Commit
6cc5651e
authored
Aug 31, 2020
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_web_renderjs_ui: do not lose some domain values
See
nexedi/jio@24b938cb
parent
c8a9f792
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
11 deletions
+17
-11
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_jio_js.js
...athTemplateItem/web_page_module/rjs_gadget_erp5_jio_js.js
+15
-9
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_jio_js.xml
...thTemplateItem/web_page_module/rjs_gadget_erp5_jio_js.xml
+2
-2
No files found.
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_jio_js.js
View file @
6cc5651e
...
@@ -137,6 +137,7 @@
...
@@ -137,6 +137,7 @@
result_list
,
result_list
,
local_roles
,
local_roles
,
local_role_found
=
false
,
local_role_found
=
false
,
selection_domain_found
=
false
,
selection_domain
,
selection_domain
,
sort_list
=
[];
sort_list
=
[];
if
(
options
.
query
)
{
if
(
options
.
query
)
{
...
@@ -186,19 +187,24 @@
...
@@ -186,19 +187,24 @@
result_list
=
isSingleDomain
(
sub_query
);
result_list
=
isSingleDomain
(
sub_query
);
if
(
result_list
)
{
if
(
result_list
)
{
parsed_query
.
query_list
.
splice
(
i
,
1
);
selection_domain_found
=
false
;
query
=
jIO
.
Query
.
objectToSearchText
(
parsed_query
);
if
(
selection_domain
)
{
for
(
key
in
result_list
)
{
for
(
key
in
result_list
)
{
if
(
result_list
.
hasOwnProperty
(
key
))
{
if
(
result_list
.
hasOwnProperty
(
key
)
&&
selection_domain
[
key
]
=
result_list
[
key
];
((
selection_domain
===
undefined
)
||
(
!
selection_domain
.
hasOwnProperty
(
key
))))
{
if
(
selection_domain
===
undefined
)
{
selection_domain
=
{};
}
}
selection_domain
[
key
]
=
result_list
[
key
];
selection_domain_found
=
true
;
}
}
}
else
{
selection_domain
=
result_list
;
}
}
if
(
selection_domain_found
===
true
)
{
parsed_query
.
query_list
.
splice
(
i
,
1
);
query
=
jIO
.
Query
.
objectToSearchText
(
parsed_query
);
i
-=
1
;
i
-=
1
;
}
}
}
}
}
}
}
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_jio_js.xml
View file @
6cc5651e
...
@@ -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
75.54791.11861.34235
</string>
</value>
<value>
<string>
9
84.41193.2075.29252
</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>
15
62768861.12
</float>
<float>
15
98877889.43
</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