diff --git a/CHANGELOG b/CHANGELOG index 55cef62e8..5efe93564 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -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 -------------------------------------------------------------------------------- diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php index 0f3c72abe..2abfbac7c 100644 --- a/views/bootstrap/class.MyDocuments.php +++ b/views/bootstrap/class.MyDocuments.php @@ -232,7 +232,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { 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"]); if ($printheader){ @@ -268,7 +268,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { } 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"]); if ($printheader){ print "";