gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-02-11 09:35:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-4.3.1' into develop

Browse Source
This commit is contained in:
Uwe Steinmann 2013-09-06 15:26:34 +02:00
commit ac7bd8cbdc
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

@ -60,7 +60,8 @@ if($view) {
$view->setParam('folder', $folder);
$view->setParam('orderby', $orderby);
$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('settings', $settings);
$view->setParam('cachedir', $settings->_cacheDir);

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

@ -987,16 +987,17 @@ function clearFilename<?php print $formName ?>() {
* @params boolean $showdocs set to true if tree shall contain documents
* as well.
*/
function printNewTreeNavigation($folderid=0, $accessmode=M_READ, $showdocs=0, $formid='form1') { /* {{{ */
function jqtree($path, $folder, $user, $accessmode, $showdocs=1) {
if($path) {
$pathfolder = array_shift($path);
function printNewTreeNavigation($folderid=0, $accessmode=M_READ, $showdocs=0, $formid='form1', $expandtree=0) { /* {{{ */
function jqtree($path, $folder, $user, $accessmode, $showdocs=1, $expandtree=0) {
if($path || $expandtree) {
if($path)
$pathfolder = array_shift($path);
$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);
if($pathfolder->getID() == $subfolder->getID()) {
if($expandtree || $pathfolder->getID() == $subfolder->getID()) {
if($showdocs) {
$documents = $folder->getDocuments();
$documents = SeedDMS_Core_DMS::filterAccess($documents, $user, $accessmode);
@ -1005,7 +1006,7 @@ function clearFilename<?php print $formName ?>() {
$children[] = $node2;
}
}
$node['children'] = jqtree($path, $subfolder, $user, $accessmode, $showdocs);
$node['children'] = jqtree($path, $subfolder, $user, $accessmode, $showdocs, $expandtree);
}
$children[] = $node;
}
@ -1032,7 +1033,7 @@ function clearFilename<?php print $formName ?>() {
$node['load_on_demand'] = false;
$node['children'] = array();
} else {
$node['children'] = jqtree($path, $folder, $this->params['user'], $accessmode, $showdocs);
$node['children'] = jqtree($path, $folder, $this->params['user'], $accessmode, $showdocs, $expandtree);
}
$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'];
$enableFolderTree = $this->params['enableFolderTree'];
$enableClipboard = $this->params['enableClipboard'];
$expandFolderTree = $this->params['expandFolderTree'];
$showtree = $this->params['showtree'];
$cachedir = $this->params['cachedir'];
$workflowmode = $this->params['workflowmode'];
@ -122,7 +123,7 @@ class SeedDMS_View_ViewFolder extends SeedDMS_Bootstrap_Style {
}
</script>
<?php
$this->printNewTreeNavigation($folderid, M_READ, 0, '');
$this->printNewTreeNavigation($folderid, M_READ, 0, '', $expandFolderTree == 2);
$this->contentContainerEnd();
} else {
$this->contentHeading("<a href=\"../out/out.ViewFolder.php?folderid=". $folderid."&showtree=1\"><i class=\"icon-plus-sign\"></i></a>", true);