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

use configured preview commands instead of old defaults

Browse Source
This commit is contained in:
Uwe Steinmann 2018-11-12 10:14:51 +01:00
parent 73bcdde56a
commit 10fc10eb1c
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
out/out.ViewFolder.php
View File

@ -73,6 +73,7 @@ if($view) {
$view->setParam('enableRecursiveCount', $settings->_enableRecursiveCount); $view->setParam('enableRecursiveCount', $settings->_enableRecursiveCount);
$view->setParam('maxRecursiveCount', $settings->_maxRecursiveCount); $view->setParam('maxRecursiveCount', $settings->_maxRecursiveCount);
$view->setParam('previewWidthList', $settings->_previewWidthList); $view->setParam('previewWidthList', $settings->_previewWidthList);
$view->setParam('previewConverters', isset($settings->_converters['preview']) ? $settings->_converters['preview'] : array());
$view->setParam('timeout', $settings->_cmdTimeout); $view->setParam('timeout', $settings->_cmdTimeout);
$view->setParam('maxItemsPerPage', $settings->_maxItemsPerPage); $view->setParam('maxItemsPerPage', $settings->_maxItemsPerPage);
$view->setParam('incItemsPerPage', $settings->_incItemsPerPage != 0 ? $settings->_incItemsPerPage : $settings->_maxItemsPerPage); $view->setParam('incItemsPerPage', $settings->_incItemsPerPage != 0 ? $settings->_incItemsPerPage : $settings->_maxItemsPerPage);

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

@ -155,6 +155,7 @@ $('#loadmore').click(function(e) {
$orderby = $this->params['orderby']; $orderby = $this->params['orderby'];
$cachedir = $this->params['cachedir']; $cachedir = $this->params['cachedir'];
$previewwidth = $this->params['previewWidthList']; $previewwidth = $this->params['previewWidthList'];
$previewconverters = $this->params['previewConverters'];
$timeout = $this->params['timeout']; $timeout = $this->params['timeout'];
$offset = $this->params['offset']; $offset = $this->params['offset'];
$limit = $this->params['limit']; $limit = $this->params['limit'];
@ -162,6 +163,7 @@ $('#loadmore').click(function(e) {
header('Content-Type: application/json'); header('Content-Type: application/json');
$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout); $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
$previewer->setConverters($previewconverters);
$subFolders = $this->callHook('folderGetSubFolders', $folder, $orderby); $subFolders = $this->callHook('folderGetSubFolders', $folder, $orderby);
if($subFolders === null) if($subFolders === null)
@ -233,6 +235,7 @@ $('#loadmore').click(function(e) {
$maxItemsPerPage = $this->params['maxItemsPerPage']; $maxItemsPerPage = $this->params['maxItemsPerPage'];
$incItemsPerPage = $this->params['incItemsPerPage']; $incItemsPerPage = $this->params['incItemsPerPage'];
$previewwidth = $this->params['previewWidthList']; $previewwidth = $this->params['previewWidthList'];
$previewconverters = $this->params['previewConverters'];
$timeout = $this->params['timeout']; $timeout = $this->params['timeout'];
$folderid = $folder->getId(); $folderid = $folder->getId();
@ -252,6 +255,7 @@ $('#loadmore').click(function(e) {
} }
$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout); $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
$previewer->setConverters($previewconverters);
echo $this->callHook('preContent'); echo $this->callHook('preContent');