erp5_core/web_renderjs_ui: jio 3.42.1

bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_jio_js.js

@@ -13806,6 +13806,7 @@ return new Parser;
           result_list,
           local_roles,
           local_role_found = false,
+          selection_domain_found = false,
           selection_domain,
           sort_list = [],
           group_list = [];
@@ -13856,19 +13857,24 @@ return new Parser;
 
                   result_list = isSingleDomain(sub_query);
                   if (result_list) {
-                    parsed_query.query_list.splice(i, 1);
-                    query = jIO.Query.objectToSearchText(parsed_query);
-                    if (selection_domain) {
+                    selection_domain_found = false;
                     for (key in result_list) {
-                        if (result_list.hasOwnProperty(key)) {
-                          selection_domain[key] = result_list[key];
+                      if (result_list.hasOwnProperty(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;
                     }
+                  }
 
                 }
               }

bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_jio_js.xml

@@ -240,7 +240,7 @@
                   </item>
                   <item>
                       <key> <string>serial</string> </key>
-                      <value> <string>979.21897.21030.48025</string> </value>
+                      <value> <string>986.19538.8051.64733</string> </value>
                   </item>
                   <item>
                       <key> <string>state</string> </key>
@@ -258,7 +258,7 @@
                           </tuple>
                           <state>
                             <tuple>
-                              <float>1582798404.51</float>
+                              <float>1598877544.48</float>
                               <string>UTC</string>
                             </tuple>
                           </state>

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/jio.js.js

@@ -13806,6 +13806,7 @@ return new Parser;
           result_list,
           local_roles,
           local_role_found = false,
+          selection_domain_found = false,
           selection_domain,
           sort_list = [],
           group_list = [];
@@ -13856,19 +13857,24 @@ return new Parser;
 
                   result_list = isSingleDomain(sub_query);
                   if (result_list) {
-                    parsed_query.query_list.splice(i, 1);
-                    query = jIO.Query.objectToSearchText(parsed_query);
-                    if (selection_domain) {
+                    selection_domain_found = false;
                     for (key in result_list) {
-                        if (result_list.hasOwnProperty(key)) {
-                          selection_domain[key] = result_list[key];
+                      if (result_list.hasOwnProperty(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;
                     }
+                  }
 
                 }
               }