gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-13 05:01:43 +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-05-03 18:19:51 +02:00
commit 21989fadbb
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,6 +91,7 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Theme_Style {
$folder = $this->params['folder']; $folder = $this->params['folder'];
$repair = $this->params['repair']; $repair = $this->params['repair'];
$objects = $this->params['repairobjects']; $objects = $this->params['repairobjects'];
$conversionmgr = $this->params['conversionmgr'];
$cachedir = $this->params['cachedir']; $cachedir = $this->params['cachedir'];
$previewwidth = $this->params['previewWidthList']; $previewwidth = $this->params['previewWidthList'];
$previewconverters = $this->params['previewConverters']; $previewconverters = $this->params['previewConverters'];
@ -99,6 +100,9 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Theme_Style {
$this->contentHeading(getMLText("objectcheck")); $this->contentHeading(getMLText("objectcheck"));
$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout); $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
if($conversionmgr)
$previewer->setConversionMgr($conversionmgr);
else
$previewer->setConverters($previewconverters); $previewer->setConverters($previewconverters);
if($objects) { if($objects) {

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

@ -55,6 +55,7 @@ $(document).ready( function() {
$settings = $this->params['settings']; $settings = $this->params['settings'];
$cachedir = $this->params['cachedir']; $cachedir = $this->params['cachedir'];
$rootfolder = $this->params['rootfolder']; $rootfolder = $this->params['rootfolder'];
$conversionmgr = $this->params['conversionmgr'];
$previewwidth = $this->params['previewWidthList']; $previewwidth = $this->params['previewWidthList'];
$previewconverters = $this->params['previewconverters']; $previewconverters = $this->params['previewconverters'];
$timeout = $this->params['timeout']; $timeout = $this->params['timeout'];
@ -65,6 +66,9 @@ $(document).ready( function() {
return; return;
$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout); $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
if($conversionmgr)
$previewer->setConversionMgr($conversionmgr);
else
$previewer->setConverters($previewconverters); $previewer->setConverters($previewconverters);
$docs = array(); $docs = array();