From 6e5634cf620fbac563725b84e9af153a03572d92 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 4 Feb 2019 11:19:04 +0100 Subject: [PATCH] path current class to jqtree --- views/bootstrap/class.Bootstrap.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index 44266ef71..785943d27 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -1736,7 +1736,7 @@ $(document).ready(function() { * @param integer $expandtree level to which the tree shall be opened */ function printNewTreeNavigationJs($folderid=0, $accessmode=M_READ, $showdocs=0, $formid='form1', $expandtree=0, $orderby='', $partialtree=false) { /* {{{ */ - function jqtree($path, $folder, $user, $accessmode, $showdocs=1, $expandtree=0, $orderby='', $level=0) { + function jqtree($obj, $path, $folder, $user, $accessmode, $showdocs=1, $expandtree=0, $orderby='', $level=0) { if($path || $expandtree>=$level) { if($path) $pathfolder = array_shift($path); @@ -1749,14 +1749,14 @@ $(document).ready(function() { if($showdocs) { $documents = $folder->getDocuments($orderby); $documents = SeedDMS_Core_DMS::filterAccess($documents, $user, $accessmode); - if($this->hasHook('filterTreeDocuments')) - $documents = $this->callHook('filterTreeDocuments', $folder, $documents); +// if($obj->hasHook('filterTreeDocuments')) +// $documents = $obj->callHook('filterTreeDocuments', $folder, $documents); foreach($documents as $document) { $node2 = array('label'=>$document->getName(), 'id'=>$document->getID(), 'load_on_demand'=>false, 'is_folder'=>false); $children[] = $node2; } } - $node['children'] = jqtree($path, $subfolder, $user, $accessmode, $showdocs, $expandtree, $orderby, $level+1); + $node['children'] = jqtree($obj, $path, $subfolder, $user, $accessmode, $showdocs, $expandtree, $orderby, $level+1); } $children[] = $node; } @@ -1795,7 +1795,7 @@ $(document).ready(function() { } } } else { - $node['children'] = jqtree($path, $folder, $this->params['user'], $accessmode, $showdocs, $expandtree, $orderby, 0); + $node['children'] = jqtree($this, $path, $folder, $this->params['user'], $accessmode, $showdocs, $expandtree, $orderby, 0); if($showdocs) { $documents = $folder->getDocuments($orderby); $documents = SeedDMS_Core_DMS::filterAccess($documents, $this->params['user'], $accessmode);