gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2024-10-04 15:12:30 +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 2023-03-13 10:26:51 +01:00
commit 2b900b5e06
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
out/out.ExpiredDocuments.php
View File

@ -47,6 +47,7 @@ if (isset($_GET["orderdir"]) && strlen($_GET["orderdir"])==1 ) {
}
if($view) {
$view->setParam('conversionmgr', $conversionmgr);
$view->setParam('showtree', showtree());
$view->setParam('orderby', $orderby);
$view->setParam('orderdir', $orderdir);

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

@ -656,11 +656,11 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
if(!empty($submenuitem['divider'])) {
$content .= " <li class=\"divider\"></li>\n";
} else {
$content .= "<li><a".(isset($menuitem['link']) ? " href=\"".$menuitem['link']."\"" : "").(isset($menuitem['target']) ? ' target="'.$menuitem['target'].'"' : '').">";
$content .= "<li><a".(isset($menuitem['link']) ? " href=\"".$menuitem['link']."\"" : "").(isset($menuitem['target']) ? ' target="'.$menuitem['target'].'"' : '');
if(!empty($menuitem['attributes']))
foreach($menuitem['attributes'] as $attr)
$content .= ' '.$attr[0].'="'.$attr[1].'"';
$content .= $menuitem['label']."</a></li>";
$content .= ">".$menuitem['label']."</a></li>";
}
}
}

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

@ -47,6 +47,7 @@ class SeedDMS_View_ExpiredDocuments extends SeedDMS_Theme_Style {
$user = $this->params['user'];
$orderby = $this->params['orderby'];
$orderdir = $this->params['orderdir'];
$conversionmgr = $this->params['conversionmgr'];
$cachedir = $this->params['cachedir'];
$previewwidth = $this->params['previewWidthList'];
$timeout = $this->params['timeout'];
@ -55,6 +56,8 @@ class SeedDMS_View_ExpiredDocuments extends SeedDMS_Theme_Style {
$db = $dms->getDB();
$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile);
if($conversionmgr)
$previewer->setConversionMgr($conversionmgr);
$this->htmlStartPage(getMLText("expired_documents"));
$this->globalNavigation();
@ -77,7 +80,6 @@ class SeedDMS_View_ExpiredDocuments extends SeedDMS_Theme_Style {
print "<th>".getMLText("action")."</th>\n";
print "</tr>\n</thead>\n<tbody>\n";
$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile);
foreach ($docs as $document) {
echo $this->documentListRow($document, $previewer);
}