gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-06-01 14:37:20 +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 2019-10-17 07:41:17 +02:00
commit 065bf4eb26
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
SeedDMS_Core/Core/inc.ClassDocument.php
View File

@ -3199,6 +3199,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
unset($this->_workflow); // force to be reloaded from DB unset($this->_workflow); // force to be reloaded from DB
$hasworkflow = $this->getWorkflow() ? true : false; $hasworkflow = $this->getWorkflow() ? true : false;
/* $pendingReview will be set when there are still open reviews */
$pendingReview=false; $pendingReview=false;
$hasReview=false; $hasReview=false;
unset($this->_reviewStatus); // force to be reloaded from DB unset($this->_reviewStatus); // force to be reloaded from DB
@ -3213,6 +3214,8 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
} }
} }
} }
/* $pendingApproval will be set when there are still open approvals */
$pendingApproval=false; $pendingApproval=false;
$hasApproval=false; $hasApproval=false;
unset($this->_approvalStatus); // force to be reloaded from DB unset($this->_approvalStatus); // force to be reloaded from DB
@ -3242,7 +3245,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
} }
} }
/* First check for a running workflow, review, approval, revision. */ /* First check for a running workflow or open reviews, approvals, revisions. */
if ($hasworkflow) $this->setStatus(S_IN_WORKFLOW,$msg,$user); if ($hasworkflow) $this->setStatus(S_IN_WORKFLOW,$msg,$user);
elseif ($pendingReview) $this->setStatus(S_DRAFT_REV,$msg,$user); elseif ($pendingReview) $this->setStatus(S_DRAFT_REV,$msg,$user);
elseif ($pendingApproval) $this->setStatus(S_DRAFT_APP,$msg,$user); elseif ($pendingApproval) $this->setStatus(S_DRAFT_APP,$msg,$user);