gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-09 04:56:06 +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 2020-05-15 08:17:12 +02:00
commit 06de96a552
2 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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;
} /* }}} */

26
SeedDMS_Core/package.xml
View File

@ -12,11 +12,11 @@
<email>uwe@steinmann.cx</email>
<active>yes</active>
</lead>
<date>2020-04-14</date>
<date>2020-05-14</date>
<time>09:43:12</time>
<version>
<release>6.0.9</release>
<api>6.0.9</api>
<release>6.0.10</release>
<api>6.0.10</api>
</version>
<stability>
<release>stable</release>
@ -24,7 +24,7 @@
</stability>
<license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
<notes>
- no changes, just keep same version as seeddms application
SeedDMS_Core_DocumentContent::delRevisor() returns -4 if user has already made a revision
</notes>
<contents>
<dir baseinstalldir="SeedDMS" name="/">
@ -1748,7 +1748,7 @@ add method SeedDMS_Core_DatabaseAccess::setLogFp()
</notes>
</release>
<release>
<date>2020-04-02</date>
<date>2020-04-14</date>
<time>09:43:12</time>
<version>
<release>5.1.16</release>
@ -1949,6 +1949,22 @@ remove a user from all its process can also be used to set a new user
</stability>
<license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
<notes>
- no changes, just keep same version as seeddms application
</notes>
</release>
<release>
<date>2020-05-14</date>
<time>09:43:12</time>
<version>
<release>6.0.9</release>
<api>6.0.9</api>
</version>
<stability>
<release>stable</release>
<api>stable</api>
</stability>
<license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
<notes>
- no changes, just keep same version as seeddms application
</notes>
</release>