gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-03-12 00:45:34 +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 2017-02-27 18:04:04 +01:00
commit 35594e23f9
3 changed files with 494 additions and 433 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -108,6 +108,7 @@
- new calendar
- move folder/document properly checks for access right if done by drag and
drop (Closes #309)
- show workflow log on document details page
--------------------------------------------------------------------------------
Changes in version 4.3.32

907
install/create_tables-innodb.sql
View File

File diff suppressed because it is too large Load Diff

19
views/bootstrap/class.DocumentVersionDetail.php
View File

@ -473,6 +473,25 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
print "</tbody>\n</table>\n";
$this->contentContainerEnd();
$wkflogs = $version->getWorkflowLog();
if($wkflogs) {
$this->contentHeading(getMLText("workflow_summary"));
$this->contentContainerStart();
echo "<table class=\"table table-condensed\"><thead>";
echo "<th>".getMLText('date')."</th><th>".getMLText('action')."</th><th>".getMLText('user')."</th><th>".getMLText('comment')."</th></tr>\n";
echo "</thead><tbody>";
foreach($wkflogs as $wkflog) {
echo "<tr>";
echo "<td>".$wkflog->getDate()."</td>";
echo "<td>".$wkflog->getTransition()->getAction()->getName()."</td>";
$loguser = $wkflog->getUser();
echo "<td>".$loguser->getFullName()."</td>";
echo "<td>".$wkflog->getComment()."</td>";
echo "</tr>";
}
print "</tbody>\n</table>\n";
$this->contentContainerEnd();
}
?>
<div class="row-fluid">
<?php