Merge branch 'MDL-68723-38' of git://github.com/mihailges/moodle into MOODLE_38_STABLE

2020-06-02 08:58:37 +08:00
parent 74206f3d78 53c46ffb2e
commit d9fe693347
1 changed files with 6 additions and 1 deletions
@@ -260,13 +260,18 @@ YUI.add('moodle-core_filepicker', function(Y) {
                // manually call dynload for parent elements in the tree so we can load other siblings
                if (options.dynload) {
                    var root = scope.treeview.getRoot();
+                    // Whether search results are currently displayed in the active repository in the filepicker.
+                    // We do not want to load siblings of parent elements when displaying search tree results.
+                    var isSearchResult = typeof options.callbackcontext.active_repo !== 'undefined' &&
+                        options.callbackcontext.active_repo.issearchresult;
                    while (root && root.children && root.children.length) {
                        root = root.children[0];
                        if (root.path == mytreeel.path) {
                            root.origpath = options.filepath;
                            root.origlist = fileslist;
+                        } else if (!root.isLeaf && root.expanded && !isSearchResult) {
+                            Y.bind(options.treeview_dynload, options.callbackcontext)(root, null);
                        }
-                        // Removed bind as of MDL-62415 as it overwrites the search tree results
                    }
                }
            } else {