Commit 6cc5651e authored by Romain Courteaud's avatar Romain Courteaud

erp5_web_renderjs_ui: do not lose some domain values

See nexedi/jio@24b938cb
parent c8a9f792
Pipeline #11262 failed with stage
...@@ -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;
} }
}
} }
} }
......
...@@ -234,7 +234,7 @@ ...@@ -234,7 +234,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>975.54791.11861.34235</string> </value> <value> <string>984.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>1562768861.12</float> <float>1598877889.43</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
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