gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-06-15 09:39:17 +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-09-09 06:57:17 +02:00
commit fdf7126a68
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
out/out.Calendar.php
View File

@ -74,6 +74,7 @@ if(isset($_GET['eventtype']) && $_GET['eventtype']) {
if($view) {
$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('calendar', $calendar);
$view->setParam('start', $start);
@ -90,6 +91,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('accessobject', $accessop);
$view->setParam('xsendfile', $settings->_enableXsendfile);

2
out/out.Timeline.php
View File

@ -54,8 +54,6 @@ if(isset($_GET['documentid']) && $_GET['documentid'] && is_numeric($_GET['docume
}
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

12
views/bootstrap/class.Calendar.php
View File

@ -43,6 +43,8 @@ class SeedDMS_View_Calendar extends SeedDMS_Theme_Style {
$event = $this->params['event'];
$strictformcheck = $this->params['strictformcheck'];
$cachedir = $this->params['cachedir'];
$conversionmgr = $this->params['conversionmgr'];
$previewconverters = $this->params['previewConverters'];
$previewwidthlist = $this->params['previewWidthList'];
$previewwidthdetail = $this->params['previewWidthDetail'];
$timeout = $this->params['timeout'];
@ -52,6 +54,10 @@ class SeedDMS_View_Calendar extends SeedDMS_Theme_Style {
print $this->folderListHeader();
print "<tbody>\n";
$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidthdetail, $timeout, $xsendfile);
if($conversionmgr)
$previewer->setConversionMgr($conversionmgr);
else
$previewer->setConverters($previewconverters);
echo $this->documentListRow($document, $previewer);
echo "</tbody>\n</table>\n";
}
@ -125,6 +131,8 @@ class SeedDMS_View_Calendar extends SeedDMS_Theme_Style {
$dms = $this->params['dms'];
$start = explode('-', $this->params['start']);
$cachedir = $this->params['cachedir'];
$conversionmgr = $this->params['conversionmgr'];
$previewconverters = $this->params['previewConverters'];
$previewwidthlist = $this->params['previewWidthList'];
$previewwidthdetail = $this->params['previewWidthDetail'];
$timeout = $this->params['timeout'];
@ -146,6 +154,10 @@ class SeedDMS_View_Calendar extends SeedDMS_Theme_Style {
print "<th>".getMLText("action")."</th>\n";
print "</tr>\n</thead>\n<tbody>\n";
$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidthdetail, $timeout, $xsendfile);
if($conversionmgr)
$previewer->setConversionMgr($conversionmgr);
else
$previewer->setConverters($previewconverters);
foreach($data as $i=>$item) {
/* Filter out timeline events for the documents not happened on the
* selected day