From 3855603dbf707721f3402c8375849ac95bb28552 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 4 Feb 2019 14:24:30 +0100 Subject: [PATCH] fix tree view when documents are shown --- views/bootstrap/class.Bootstrap.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index b906808d3..8ba4241c6 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -1585,15 +1585,15 @@ $(document).ready(function() { foreach($subfolders as $subfolder) { $node = array('label'=>$subfolder->getName(), 'id'=>$subfolder->getID(), 'load_on_demand'=>($subfolder->hasSubFolders() || ($subfolder->hasDocuments() && $showdocs)) ? false : false, 'is_folder'=>true); if($expandtree>=$level || $pathfolder->getID() == $subfolder->getID()) { + $node['children'] = jqtree($path, $subfolder, $user, $accessmode, $showdocs, $expandtree, $orderby, $level+1); if($showdocs) { - $documents = $folder->getDocuments($orderby); + $documents = $subfolder->getDocuments($orderby); $documents = SeedDMS_Core_DMS::filterAccess($documents, $user, $accessmode); foreach($documents as $document) { $node2 = array('label'=>$document->getName(), 'id'=>$document->getID(), 'load_on_demand'=>false, 'is_folder'=>false); - $children[] = $node2; + $node['children'][] = $node2; } } - $node['children'] = jqtree($path, $subfolder, $user, $accessmode, $showdocs, $expandtree, $orderby, $level+1); } $children[] = $node; }