Commit 008516f5 authored by Romain Courteaud's avatar Romain Courteaud

Release 3.42.1

parent 24b938cb
Pipeline #11258 failed with stage
in 0 seconds
...@@ -26,7 +26,7 @@ TESTDIR = test ...@@ -26,7 +26,7 @@ TESTDIR = test
EXAMPLEDIR = examples EXAMPLEDIR = examples
EXTERNALDIR = external EXTERNALDIR = external
VERSION = 3.42.0 VERSION = 3.42.1
JIOVERSION = ${DISTDIR}/jio-v${VERSION}.js JIOVERSION = ${DISTDIR}/jio-v${VERSION}.js
JIOLATEST = ${DISTDIR}/jio-latest.js JIOLATEST = ${DISTDIR}/jio-latest.js
JIONODEVERSION = ${DISTDIR}/jio-v${VERSION}-node.js JIONODEVERSION = ${DISTDIR}/jio-v${VERSION}-node.js
......
...@@ -14345,6 +14345,7 @@ var jIO = window.jIO, ...@@ -14345,6 +14345,7 @@ var jIO = window.jIO,
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 = [];
...@@ -14395,19 +14396,24 @@ var jIO = window.jIO, ...@@ -14395,19 +14396,24 @@ var jIO = window.jIO,
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;
} }
}
} }
} }
......
...@@ -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;
} }
}
} }
} }
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
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