[tryton-commits] changeset in sao:default Do not try to expand pseudo-children of...

[Cédric Krier]

changeset 0fb9992f4557 in sao:default
details: https://hg.tryton.org/sao?cmd=changeset&node=0fb9992f4557
description:
        Do not try to expand pseudo-children of reference field

        Since issue5667 the export dialog adds pseudo children to reference 
fields but
        they are not children nodes but just sibling. So we must not try to 
expand the
        node of the reference field when loading an predefined export.

        issue10875
        review383511003
diffstat:

 src/window.js |  14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diffs (47 lines):

diff -r 0b692f8ac308 -r 0fb9992f4557 src/window.js
--- a/src/window.js     Sun Oct 31 10:24:32 2021 +0100
+++ b/src/window.js     Sun Oct 31 10:42:08 2021 +0100
@@ -1372,7 +1372,7 @@
             }.bind(this));
         },
         children_expand: function(node) {
-            if (jQuery.isEmptyObject(node.children)) {
+            if (jQuery.isEmptyObject(node.children) && node.relation) {
                 this.model_populate(
                     this._get_fields(node.relation), node.children,
                     node.field + '/', node.name + '/');
@@ -1442,9 +1442,10 @@
                 if (field.name == (prefix + parents[i]) ||
                     field.field == (prefix + parents[i])) {
                     this.children_expand(field);
-                    fields = field.children;
                     prefix += parents[i] + '/';
-                    this._traverse(fields, prefix, parents, ++i);
+                    if (field.children) {
+                        this._traverse(field.children, prefix, parents, ++i);
+                    }
                     break;
                 }
             }
@@ -1750,7 +1751,7 @@
             }.bind(this));
         },
         children_expand: function(node) {
-            if (jQuery.isEmptyObject(node.children)) {
+            if (jQuery.isEmptyObject(node.children) && node.relation) {
                 this.model_populate(
                     this._get_fields(node.relation), node.children,
                     node.path + '/', node.long_string + '/');
@@ -1895,9 +1896,10 @@
                 field = fields[names[item]];
                 if (field.path == (prefix + parents[i])) {
                     this.children_expand(field);
-                    fields = field.children;
                     prefix += parents[i] + '/';
-                    this._traverse(fields, prefix, parents, ++i);
+                    if (field.children) {
+                        this._traverse(field.children, prefix, parents, ++i);
+                    }
                     break;
                 }
             }