gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-14 05:31:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

folder tree can be expanded again on default

Browse Source
This commit is contained in:
Uwe Steinmann 2013-09-06 15:24:51 +02:00
parent a7af6656b4
commit 9f6cb6453c
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
out/out.ViewFolder.php
View File

@ -59,7 +59,8 @@ if($view) {
$view->setParam('folder', $folder); $view->setParam('folder', $folder);
$view->setParam('orderby', $orderby); $view->setParam('orderby', $orderby);
$view->setParam('enableFolderTree', $settings->_enableFolderTree); $view->setParam('enableFolderTree', $settings->_enableFolderTree);
$view->setParam('enableClipboard', $settings->_enableClipboard); $view->setParam('enableClipboard', $settings->_enableClipboard);
$view->setParam('expandFolderTree', $settings->_expandFolderTree);
$view->setParam('showtree', showtree()); $view->setParam('showtree', showtree());
$view->setParam('cachedir', $settings->_cacheDir); $view->setParam('cachedir', $settings->_cacheDir);
$view->setParam('workflowmode', $settings->_workflowMode); $view->setParam('workflowmode', $settings->_workflowMode);

15
views/bootstrap/class.Bootstrap.php
View File

@ -985,16 +985,17 @@ function clearFilename<?php print $formName ?>() {
* @params boolean $showdocs set to true if tree shall contain documents * @params boolean $showdocs set to true if tree shall contain documents
* as well. * as well.
*/ */
function printNewTreeNavigation($folderid=0, $accessmode=M_READ, $showdocs=0, $formid='form1') { /* {{{ */ function printNewTreeNavigation($folderid=0, $accessmode=M_READ, $showdocs=0, $formid='form1', $expandtree=0) { /* {{{ */
function jqtree($path, $folder, $user, $accessmode, $showdocs=1) { function jqtree($path, $folder, $user, $accessmode, $showdocs=1, $expandtree=0) {
if($path) { if($path || $expandtree) {
$pathfolder = array_shift($path); if($path)
$pathfolder = array_shift($path);
$subfolders = $folder->getSubFolders(); $subfolders = $folder->getSubFolders();
$subfolders = SeedDMS_Core_DMS::filterAccess($subfolders, $user, $accessmode); $subfolders = SeedDMS_Core_DMS::filterAccess($subfolders, $user, $accessmode);
$children = array(); $children = array();
foreach($subfolders as $subfolder) { foreach($subfolders as $subfolder) {
$node = array('label'=>$subfolder->getName(), 'id'=>$subfolder->getID(), 'load_on_demand'=>$subfolder->hasSubFolders() ? true : false, 'is_folder'=>true); $node = array('label'=>$subfolder->getName(), 'id'=>$subfolder->getID(), 'load_on_demand'=>$subfolder->hasSubFolders() ? true : false, 'is_folder'=>true);
if($pathfolder->getID() == $subfolder->getID()) { if($expandtree || $pathfolder->getID() == $subfolder->getID()) {
if($showdocs) { if($showdocs) {
$documents = $folder->getDocuments(); $documents = $folder->getDocuments();
$documents = SeedDMS_Core_DMS::filterAccess($documents, $user, $accessmode); $documents = SeedDMS_Core_DMS::filterAccess($documents, $user, $accessmode);
@ -1003,7 +1004,7 @@ function clearFilename<?php print $formName ?>() {
$children[] = $node2; $children[] = $node2;
} }
} }
$node['children'] = jqtree($path, $subfolder, $user, $accessmode, $showdocs); $node['children'] = jqtree($path, $subfolder, $user, $accessmode, $showdocs, $expandtree);
} }
$children[] = $node; $children[] = $node;
} }
@ -1030,7 +1031,7 @@ function clearFilename<?php print $formName ?>() {
$node['load_on_demand'] = false; $node['load_on_demand'] = false;
$node['children'] = array(); $node['children'] = array();
} else { } else {
$node['children'] = jqtree($path, $folder, $this->params['user'], $accessmode, $showdocs); $node['children'] = jqtree($path, $folder, $this->params['user'], $accessmode, $showdocs, $expandtree);
} }
$tree[] = $node; $tree[] = $node;

3
views/bootstrap/class.ViewFolder.php
View File

@ -78,6 +78,7 @@ class SeedDMS_View_ViewFolder extends SeedDMS_Bootstrap_Style {
$orderby = $this->params['orderby']; $orderby = $this->params['orderby'];
$enableFolderTree = $this->params['enableFolderTree']; $enableFolderTree = $this->params['enableFolderTree'];
$enableClipboard = $this->params['enableClipboard']; $enableClipboard = $this->params['enableClipboard'];
$expandFolderTree = $this->params['expandFolderTree'];
$showtree = $this->params['showtree']; $showtree = $this->params['showtree'];
$cachedir = $this->params['cachedir']; $cachedir = $this->params['cachedir'];
$workflowmode = $this->params['workflowmode']; $workflowmode = $this->params['workflowmode'];
@ -115,7 +116,7 @@ class SeedDMS_View_ViewFolder extends SeedDMS_Bootstrap_Style {
} }
</script> </script>
<?php <?php
$this->printNewTreeNavigation($folderid, M_READ, 0, ''); $this->printNewTreeNavigation($folderid, M_READ, 0, '', $expandFolderTree == 2);
$this->contentContainerEnd(); $this->contentContainerEnd();
} else { } else {
$this->contentHeading("<a href=\"../out/out.ViewFolder.php?folderid=". $folderid."&showtree=1\"><i class=\"icon-plus-sign\"></i></a>", true); $this->contentHeading("<a href=\"../out/out.ViewFolder.php?folderid=". $folderid."&showtree=1\"><i class=\"icon-plus-sign\"></i></a>", true);