diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php index 3d591f393..b30e1ead1 100644 --- a/SeedDMS_Core/Core/inc.ClassDocument.php +++ b/SeedDMS_Core/Core/inc.ClassDocument.php @@ -3673,21 +3673,31 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ $ddate = $db->qstr($date); else $ddate = $db->getCurrentDatetime(); + $db->startTransaction(); $queryStr = "INSERT INTO `tblDocumentStatusLog` (`statusID`, `status`, `comment`, `date`, `userID`) ". "VALUES ('". $this->_status["statusID"] ."', '". (int) $status ."', ".$db->qstr($comment).", ".$ddate.", '". $updateUser->getID() ."')"; $res = $db->getResult($queryStr); - if (is_bool($res) && !$res) + if (is_bool($res) && !$res) { + $db->rollbackTransaction(); return false; + } /* Check if 'onSetStatus' callback is set */ if(isset($this->_dms->callbacks['onSetStatus'])) { foreach($this->_dms->callbacks['onSetStatus'] as $callback) { $ret = call_user_func($callback[0], $callback[1], $this, $this->_status["status"], $status); - if(is_bool($ret)) + if(is_bool($ret)) { + unset($this->_status); + if($ret) + $db->commitTransaction(); + else + $db->rollbackTransaction(); return $ret; + } } } + $db->commitTransaction(); unset($this->_status); return true; } /* }}} */ diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml index 7b44c5935..f19ca585f 100644 --- a/SeedDMS_Core/package.xml +++ b/SeedDMS_Core/package.xml @@ -12,11 +12,11 @@ uwe@steinmann.cx yes - 2020-04-14 + 2020-05-14 - 6.0.9 - 6.0.9 + 6.0.10 + 6.0.10 stable @@ -24,7 +24,7 @@ GPL License -- no changes, just keep same version as seeddms application +SeedDMS_Core_DocumentContent::delRevisor() returns -4 if user has already made a revision @@ -1748,7 +1748,7 @@ add method SeedDMS_Core_DatabaseAccess::setLogFp() - 2020-04-02 + 2020-04-14 5.1.16 @@ -1949,6 +1949,22 @@ remove a user from all its process can also be used to set a new user GPL License +- no changes, just keep same version as seeddms application + + + + 2020-05-14 + + + 6.0.9 + 6.0.9 + + + stable + stable + + GPL License + - no changes, just keep same version as seeddms application