From 43e98643ee9e2e6bd3db8c1d13a29e380c3e0a56 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 29 Sep 2021 14:55:55 +0200 Subject: [PATCH] verifyStatus() returns new status (or old status if not changed) --- SeedDMS_Core/Core/inc.ClassDocument.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php index 0dc0a994a..3f12aab82 100644 --- a/SeedDMS_Core/Core/inc.ClassDocument.php +++ b/SeedDMS_Core/Core/inc.ClassDocument.php @@ -2966,7 +2966,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ unset($this->_status); $st=$this->getStatus(); - if (!$ignorecurrentstatus && ($st["status"]==S_OBSOLETE || $st["status"]==S_REJECTED || $st["status"]==S_EXPIRED )) return; + if (!$ignorecurrentstatus && ($st["status"]==S_OBSOLETE || $st["status"]==S_REJECTED || $st["status"]==S_EXPIRED )) return $st['status']; unset($this->_workflow); // force to be reloaded from DB $hasworkflow = $this->getWorkflow() ? true : false; @@ -3006,10 +3006,11 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ } /* First check for a running workflow or open reviews or approvals. */ - if ($hasworkflow) $this->setStatus(S_IN_WORKFLOW,$msg,$user); - elseif ($pendingReview) $this->setStatus(S_DRAFT_REV,$msg,$user); - elseif ($pendingApproval) $this->setStatus(S_DRAFT_APP,$msg,$user); - else $this->setStatus(S_RELEASED,$msg,$user); + if ($hasworkflow) { $newstatus = S_IN_WORKFLOW; $ret = $this->setStatus(S_IN_WORKFLOW,$msg,$user); } + elseif ($pendingReview) { $newstatus = S_DRAFT_REV; $ret = $this->setStatus(S_DRAFT_REV,$msg,$user); } + elseif ($pendingApproval) { $newstatus = S_DRAFT_APP; $ret = $this->setStatus(S_DRAFT_APP,$msg,$user); } + else { $newstatus = S_RELEASED; $ret = $this->setStatus(S_RELEASED,$msg,$user); } + return $ret ? $newstatus : $ret; } /* }}} */ function __construct($id, $document, $version, $comment, $date, $userID, $dir, $orgFileName, $fileType, $mimeType, $fileSize=0, $checksum='') { /* {{{ */