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

setStatus will not fail if status is unchanged, finishRevision() will no longer set state waіting

Browse Source
This commit is contained in:
Uwe Steinmann 2016-03-24 15:40:25 +01:00
parent 50a39d439a
commit f5db1b66cb
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2984,7 +2984,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
$this->getStatus(); $this->getStatus();
} }
if ($this->_status["status"]==$status) { if ($this->_status["status"]==$status) {
return false; return true;
} }
if($date) if($date)
$ddate = $db->qstr($date); $ddate = $db->qstr($date);
@ -4631,6 +4631,9 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
* this may not be possible. * this may not be possible.
*/ */
$db->startTransaction(); $db->startTransaction();
/* Does it make sense to put all revisions into sleeping mode? I guess
* not. If a document was released or rejected the revision are useless
* anyway
foreach($revisionStatus as $status) { foreach($revisionStatus as $status) {
if($status['status'] != S_LOG_SLEEPING && $status['status'] != S_LOG_USER_REMOVED) { if($status['status'] != S_LOG_SLEEPING && $status['status'] != S_LOG_USER_REMOVED) {
$queryStr = "INSERT INTO `tblDocumentRevisionLog` (`revisionID`, `status`, $queryStr = "INSERT INTO `tblDocumentRevisionLog` (`revisionID`, `status`,
@ -4645,6 +4648,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
} }
} }
} }
*/
if(!$this->setStatus($docstatus, $docmsg, $requestUser)) { if(!$this->setStatus($docstatus, $docmsg, $requestUser)) {
$db->rollbackTransaction(); $db->rollbackTransaction();
return false; return false;