gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-14 21:51:32 +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 2015-08-07 14:30:07 +02:00
commit 6d8930a360
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG
View File

@ -5,7 +5,7 @@
- MyDocumets: list only documents to approve which have passed review - MyDocumets: list only documents to approve which have passed review
- show preview image in Review/Approval summary - show preview image in Review/Approval summary
- timeout for external commands for creating fulltext index can be set - timeout for external commands for creating fulltext index can be set
- add translations for korean - add translations for korean, croation, ukrainian
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Changes in version 4.3.19 Changes in version 4.3.19

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

@ -1997,6 +1997,7 @@ mayscript>
*/ */
protected function printProtocol($latestContent, $type="") { /* {{{ */ protected function printProtocol($latestContent, $type="") { /* {{{ */
$dms = $this->params['dms']; $dms = $this->params['dms'];
$document = $latestContent->getDocument();
?> ?>
<legend><?php printMLText($type.'_log'); ?></legend> <legend><?php printMLText($type.'_log'); ?></legend>
<table class="table condensed"> <table class="table condensed">
@ -2050,13 +2051,13 @@ mayscript>
case "review": case "review":
if($rec['file']) { if($rec['file']) {
echo "<br />"; echo "<br />";
echo "<a href=\"../op/op.Download.php?documentid=".$documentid."&reviewlogid=".$rec['reviewLogID']."\" class=\"btn btn-mini\"><i class=\"icon-download\"></i> ".getMLText('download')."</a>"; echo "<a href=\"../op/op.Download.php?documentid=".$document->getID()."&reviewlogid=".$rec['reviewLogID']."\" class=\"btn btn-mini\"><i class=\"icon-download\"></i> ".getMLText('download')."</a>";
} }
break; break;
case "approval": case "approval":
if($rec['file']) { if($rec['file']) {
echo "<br />"; echo "<br />";
echo "<a href=\"../op/op.Download.php?documentid=".$documentid."&approvelogid=".$rec['approveLogID']."\" class=\"btn btn-mini\"><i class=\"icon-download\"></i> ".getMLText('download')."</a>"; echo "<a href=\"../op/op.Download.php?documentid=".$document->getID()."&approvelogid=".$rec['approveLogID']."\" class=\"btn btn-mini\"><i class=\"icon-download\"></i> ".getMLText('download')."</a>";
} }
break; break;
} }