mirror of
https://git.code.sf.net/p/seeddms/code
synced 2024-10-05 23:52:08 +00:00
Merge branch 'seeddms-4.3.x' into seeddms-5.0.x
This commit is contained in:
commit
dd939122de
|
@ -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
|
||||
--------------------------------------------------------------------------------
|
||||
|
|
|
@ -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 "<table class=\"table table-condensed\">";
|
||||
|
|
Loading…
Reference in New Issue
Block a user