gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-06-07 13:49:23 +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-07-08 06:55:51 +02:00
commit dd939122de
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG
View File

@ -1,3 +1,9 @@
--------------------------------------------------------------------------------
Changes in version 4.3.20
--------------------------------------------------------------------------------
- fix setting expire date when editing a document (Closes: #225)
- MyDocumets: list only documents to approve which have passed review
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Changes in version 4.3.19 Changes in version 4.3.19
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------

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

@ -232,7 +232,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
foreach ($approvalStatus["indstatus"] as $st) { foreach ($approvalStatus["indstatus"] as $st) {
if ( $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]])) { if ( $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]]) && $docIdx[$st["documentID"]][$st["version"]]['status'] == S_DRAFT_APP) {
$document = $dms->getDocument($st["documentID"]); $document = $dms->getDocument($st["documentID"]);
if ($printheader){ if ($printheader){
@ -268,7 +268,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
} }
foreach ($approvalStatus["grpstatus"] as $st) { foreach ($approvalStatus["grpstatus"] as $st) {
if (!in_array($st["documentID"], $iRev) && $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]]) && $docIdx[$st["documentID"]][$st["version"]]['owner'] != $user->getId()) { if (!in_array($st["documentID"], $iRev) && $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]]) && $docIdx[$st["documentID"]][$st["version"]]['status'] == S_DRAFT_APP && $docIdx[$st["documentID"]][$st["version"]]['owner'] != $user->getId()) {
$document = $dms->getDocument($st["documentID"]); $document = $dms->getDocument($st["documentID"]);
if ($printheader){ if ($printheader){
print "<table class=\"table table-condensed\">"; print "<table class=\"table table-condensed\">";