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

subtree takes sort order into account

Browse Source
This commit is contained in:
Uwe Steinmann 2014-03-14 15:10:29 +01:00
parent 52e24892f6
commit aa399e50bb
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
op/op.Ajax.php
View File

@ -122,11 +122,15 @@ switch($command) {
$showdocs = false; $showdocs = false;
else else
$showdocs = true; $showdocs = true;
if(empty($_GET['orderby']))
$orderby = $settings->_sortFoldersDefault;
else
$orderby = $_GET['orderby'];
$folder = $dms->getFolder($nodeid); $folder = $dms->getFolder($nodeid);
if (!is_object($folder)) return ''; if (!is_object($folder)) return '';
$subfolders = $folder->getSubFolders(); $subfolders = $folder->getSubFolders($orderby);
$subfolders = SeedDMS_Core_DMS::filterAccess($subfolders, $user, M_READ); $subfolders = SeedDMS_Core_DMS::filterAccess($subfolders, $user, M_READ);
$tree = array(); $tree = array();
foreach($subfolders as $subfolder) { foreach($subfolders as $subfolder) {
@ -136,7 +140,7 @@ switch($command) {
$tree[] = $level; $tree[] = $level;
} }
if($showdocs) { if($showdocs) {
$documents = $folder->getDocuments(); $documents = $folder->getDocuments($orderby);
$documents = SeedDMS_Core_DMS::filterAccess($documents, $user, M_READ); $documents = SeedDMS_Core_DMS::filterAccess($documents, $user, M_READ);
foreach($documents as $document) { foreach($documents as $document) {
$level = array('label'=>$document->getName(), 'id'=>$document->getID(), 'load_on_demand'=>false, 'is_folder'=>false); $level = array('label'=>$document->getName(), 'id'=>$document->getID(), 'load_on_demand'=>false, 'is_folder'=>false);