gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2024-10-16 13:02:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-4.3.x' into seeddms-5.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2016-12-07 15:38:27 +01:00
commit a8e2fcd5d6
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
views/bootstrap/class.MyDocuments.php
View File

@ -621,6 +621,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
print "<tr>\n";
$latestContent = $document->getLatestContent();
$workflow = $latestContent->getWorkflow();
$previewer->createPreview($latestContent);
print "<td><a href=\"../op/op.Download.php?documentid=".$res["documentID"]."&version=".$res["version"]."\">";
if($previewer->hasPreview($latestContent)) {
@ -630,7 +631,9 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
}
print "</a></td>";
print "<td><a href=\"out.ViewDocument.php?documentid=".$res["documentID"]."&currenttab=workflow\">" . htmlspecialchars($res["name"]) . "</a></td>\n";
print "<td>".getOverallStatusText($res["status"])."</td>";
// print "<td>".getOverallStatusText($res["status"])."</td>";
$workflowstate = $latestContent->getWorkflowState();
print '<td>'.getOverallStatusText($res["status"]).': '.$workflow->getName().'<br />'.$workflowstate->getName().'</td>';
print "<td>".$res["version"]."</td>";
print "<td>".$res["statusDate"]." ".htmlspecialchars($res["statusName"])."</td>";
print "<td>".(!$res["expires"] ? "-":getReadableDate($res["expires"]))."</td>";