Commit c8a9f792 authored by Romain Courteaud's avatar Romain Courteaud

erp5_core/web_renderjs_ui: jio 3.42.1

parent e5cb7960
...@@ -13806,6 +13806,7 @@ return new Parser; ...@@ -13806,6 +13806,7 @@ return new Parser;
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 = [],
group_list = []; group_list = [];
...@@ -13856,19 +13857,24 @@ return new Parser; ...@@ -13856,19 +13857,24 @@ return new Parser;
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;
} }
}
} }
} }
......
...@@ -240,7 +240,7 @@ ...@@ -240,7 +240,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>979.21897.21030.48025</string> </value> <value> <string>986.19538.8051.64733</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -258,7 +258,7 @@ ...@@ -258,7 +258,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1582798404.51</float> <float>1598877544.48</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -13806,6 +13806,7 @@ return new Parser; ...@@ -13806,6 +13806,7 @@ return new Parser;
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 = [],
group_list = []; group_list = [];
...@@ -13856,19 +13857,24 @@ return new Parser; ...@@ -13856,19 +13857,24 @@ return new Parser;
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;
} }
}
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment