From d8d51f19108dbcfbe768501f93ec7a9db4c2ac82 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 31 May 2013 16:13:15 +0200 Subject: [PATCH] show children of current folder in tree --- views/bootstrap/class.Bootstrap.php | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index b4c835971..f9da576d4 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -952,7 +952,7 @@ function clearFilename() { * as well. */ function printNewTreeNavigation($folderid=0, $accessmode=M_READ, $showdocs=0) { /* {{{ */ - function jqtree($path, $folder, $user, $showdocs=1) { + function jqtree($path, $folder, $user, $accessmode, $showdocs=1) { if($path) { $pathfolder = array_shift($path); $subfolders = $folder->getSubFolders(); @@ -969,13 +969,22 @@ function clearFilename() { $children[] = $node2; } } - $node['children'] = jqtree($path, $subfolder, $user, $showdocs); + $node['children'] = jqtree($path, $subfolder, $user, $accessmode, $showdocs); } $children[] = $node; } return $children; - } else - return array(); + } else { + $subfolders = $folder->getSubFolders(); + $subfolders = SeedDMS_Core_DMS::filterAccess($subfolders, $user, $accessmode); + $children = array(); + foreach($subfolders as $subfolder) { + $node = array('label'=>$subfolder->getName(), 'id'=>$subfolder->getID(), 'load_on_demand'=>$subfolder->hasSubFolders() ? true : false, 'is_folder'=>true); + $children[] = $node; + } + return $children; + } + return array(); } if($folderid) { @@ -987,7 +996,7 @@ function clearFilename() { $node['load_on_demand'] = false; $node['children'] = array(); } else { - $node['children'] = jqtree($path, $folder, $this->params['user'], $showdocs); + $node['children'] = jqtree($path, $folder, $this->params['user'], $accessmode, $showdocs); } $tree[] = $node;