gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2024-11-26 15:32:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2020-07-21 07:08:57 +02:00
commit 9c8f737dcd
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -169,6 +169,7 @@
- fix parsing of file size
- major rework of restapi which has now a swagger specification
- fix indexing of documents by script (Closes: #479)
- fix ordering of folders in DocumentChooser and FolderChooser
--------------------------------------------------------------------------------
Changes in version 5.1.17

2
out/out.DocumentChooser.php
View File

@ -54,9 +54,9 @@ if(isset($_GET['action']) && $_GET['action'] == 'subtree') {
$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
if($view) {
$view->setParam('orderby', $settings->_sortFoldersDefault);
if(isset($_GET['action']) && $_GET['action'] == 'subtree') {
$view->setParam('node', $node);
$view->setParam('orderby', $settings->_sortFoldersDefault);
} else {
$view->setParam('folder', $folder);
$view->setParam('form', $form);

6
views/bootstrap/class.DocumentChooser.php
View File

@ -42,10 +42,11 @@ class SeedDMS_View_DocumentChooser extends SeedDMS_Bootstrap_Style {
function js() { /* {{{ */
$folder = $this->params['folder'];
$form = $this->params['form'];
$orderby = $this->params['orderby'];
$partialtree = $this->params['partialtree'];
header('Content-Type: application/javascript');
$this->printNewTreeNavigationJs($folder->getID(), M_READ, 1, $form, 0, 'n', $partialtree);
$this->printNewTreeNavigationJs($folder->getID(), M_READ, 1, $form, 0, $orderby, $partialtree);
} /* }}} */
function show() { /* {{{ */
@ -54,11 +55,12 @@ class SeedDMS_View_DocumentChooser extends SeedDMS_Bootstrap_Style {
$folder = $this->params['folder'];
$form = $this->params['form'];
$partialtree = $this->params['partialtree'];
$orderby = $this->params['orderby'];
// $this->htmlStartPage(getMLText("choose_target_document"));
// $this->contentContainerStart();
// $this->printNewTreeNavigationHtml($folder->getID(), M_READ, 1, $form);
$this->printNewTreeNavigationHtml($folder->getID(), M_READ, 1, $form, 0, '', $partialtree);
$this->printNewTreeNavigationHtml($folder->getID(), M_READ, 1, $form, 0, $orderby);
echo '<script src="../out/out.DocumentChooser.php?action=js&'.$_SERVER['QUERY_STRING'].'"></script>'."\n";
// $this->contentContainerEnd();
// $this->htmlEndPage(true);

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

@ -43,9 +43,10 @@ class SeedDMS_View_FolderChooser extends SeedDMS_Bootstrap_Style {
$rootfolderid = $this->params['rootfolderid'];
$form = $this->params['form'];
$mode = $this->params['mode'];
$orderby = $this->params['orderby'];
header('Content-Type: application/javascript');
$this->printNewTreeNavigationJs($rootfolderid, $mode, 0, $form);
$this->printNewTreeNavigationJs($rootfolderid, $mode, 0, $form, '', $orderby);
} /* }}} */
function show() { /* {{{ */