gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-03-12 00:45:34 +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 2022-08-18 10:04:00 +02:00
commit e5057d8223
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -240,6 +240,7 @@
- add tabs on ViewFolder page
- link behind logo in header can be set in extension
- move attributes for documents and folders on search page into own accordion
- search page uses conversion mgr for preview images
--------------------------------------------------------------------------------
Changes in version 5.1.26

1
out/out.Search.php
View File

@ -642,6 +642,7 @@ if($settings->_showSingleSearchHit && count($entries) == 1) {
$view->setParam('enablefullsearch', $settings->_enableFullSearch);
$view->setParam('previewWidthList', $settings->_previewWidthList);
$view->setParam('previewConverters', isset($settings->_converters['preview']) ? $settings->_converters['preview'] : array());
$view->setParam('conversionmgr', $conversionmgr);
$view->setParam('timeout', $settings->_cmdTimeout);
$view->setParam('xsendfile', $settings->_enableXsendfile);
$view->setParam('reception', $reception);

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

@ -234,6 +234,7 @@ function typeahead() { /* {{{ */
$cachedir = $this->params['cachedir'];
$previewwidth = $this->params['previewWidthList'];
$previewconverters = $this->params['previewConverters'];
$conversionmgr = $this->params['conversionmgr'];
$timeout = $this->params['timeout'];
$xsendfile = $this->params['xsendfile'];
$reception = $this->params['reception'];
@ -768,7 +769,10 @@ function typeahead() { /* {{{ */
print "<tbody>\n";
$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile);
$previewer->setConverters($previewconverters);
if($conversionmgr)
$previewer->setConversionMgr($conversionmgr);
else
$previewer->setConverters($previewconverters);
foreach ($entries as $entry) {
if($entry->isType('document')) {
$document = $entry;