diff --git a/out/out.Timeline.php b/out/out.Timeline.php index 3f2973524..46e946cf8 100644 --- a/out/out.Timeline.php +++ b/out/out.Timeline.php @@ -58,6 +58,7 @@ if($view) { $view->setParam('dms', $dms); $view->setParam('user', $user); $view->setParam('accessobject', $accessop); + $view->setParam('conversionmgr', $conversionmgr); $view->setParam('onepage', $settings->_onePageMode); // do most navigation by reloading areas of pages with ajax $view->setParam('showtree', showtree()); $view->setParam('fromdate', isset($_GET['fromdate']) ? $_GET['fromdate'] : ''); @@ -68,6 +69,7 @@ if($view) { $view->setParam('cachedir', $settings->_cacheDir); $view->setParam('previewWidthList', $settings->_previewWidthList); $view->setParam('previewWidthDetail', $settings->_previewWidthDetail); + $view->setParam('previewConverters', isset($settings->_converters['preview']) ? $settings->_converters['preview'] : array()); $view->setParam('timeout', $settings->_cmdTimeout); $view->setParam('xsendfile', $settings->_enableXsendfile); $view($_GET); diff --git a/views/bootstrap/class.Timeline.php b/views/bootstrap/class.Timeline.php index bf4f5cd1e..93732e9dc 100644 --- a/views/bootstrap/class.Timeline.php +++ b/views/bootstrap/class.Timeline.php @@ -41,6 +41,8 @@ class SeedDMS_View_Timeline extends SeedDMS_Theme_Style { $document = $this->params['document']; $version = $this->params['version']; $cachedir = $this->params['cachedir']; + $conversionmgr = $this->params['conversionmgr']; + $previewconverters = $this->params['previewConverters']; $previewwidthlist = $this->params['previewWidthList']; $previewwidthdetail = $this->params['previewWidthDetail']; $timeout = $this->params['timeout']; @@ -50,6 +52,10 @@ class SeedDMS_View_Timeline extends SeedDMS_Theme_Style { print $this->folderListHeader(); print "\n"; $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidthdetail, $timeout, $xsendfile); + if($conversionmgr) + $previewer->setConversionMgr($conversionmgr); + else + $previewer->setConverters($previewconverters); $extracontent = array(); $extracontent['below_title'] = $this->getListRowPath($document); echo $this->documentListRow($document, $previewer, 0, false, $extracontent); diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php index 029e013a3..5f52c2f4d 100644 --- a/views/bootstrap/class.ViewDocument.php +++ b/views/bootstrap/class.ViewDocument.php @@ -130,6 +130,8 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style { $cachedir = $this->params['cachedir']; $conversionmgr = $this->params['conversionmgr']; $previewconverters = $this->params['previewConverters']; + $previewwidthlist = $this->params['previewWidthList']; + $previewwidthdetail = $this->params['previewWidthDetail']; $timeout = $this->params['timeout']; $xsendfile = $this->params['xsendfile']; $document = $this->params['document'];