gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-13 05:01:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pass updating user to callback onSetStatus, finish revision when document status changes form inrevision to released

Browse Source
This commit is contained in:
Uwe Steinmann 2020-05-15 17:24:04 +02:00
parent 6319318773
commit 2e31004982
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3324,7 +3324,10 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
else $this->setStatus($initialstatus,$msg,$user); else $this->setStatus($initialstatus,$msg,$user);
} elseif($st["status"]==S_IN_REVISION) { } elseif($st["status"]==S_IN_REVISION) {
if($needsCorrection) $this->setStatus(S_NEEDS_CORRECTION,$msg,$user); if($needsCorrection) $this->setStatus(S_NEEDS_CORRECTION,$msg,$user);
else $this->setStatus(S_RELEASED,$msg,$user); else {
$this->finishRevision($user, S_RELEASED, 'Finished revision workflow', $msg);
// $this->setStatus(S_RELEASED,$msg,$user);
}
} elseif($st["status"]==S_EXPIRED) { } elseif($st["status"]==S_EXPIRED) {
$this->setStatus(S_RELEASED,$msg,$user); $this->setStatus(S_RELEASED,$msg,$user);
} }
@ -3685,7 +3688,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
/* Check if 'onSetStatus' callback is set */ /* Check if 'onSetStatus' callback is set */
if(isset($this->_dms->callbacks['onSetStatus'])) { if(isset($this->_dms->callbacks['onSetStatus'])) {
foreach($this->_dms->callbacks['onSetStatus'] as $callback) { foreach($this->_dms->callbacks['onSetStatus'] as $callback) {
$ret = call_user_func($callback[0], $callback[1], $this, $this->_status["status"], $status); $ret = call_user_func($callback[0], $callback[1], $this, $updateUser, $this->_status["status"], $status);
if(is_bool($ret)) { if(is_bool($ret)) {
unset($this->_status); unset($this->_status);
if($ret) if($ret)