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

do not release a document in verifyStatus() if in draft status

Browse Source
This commit is contained in:
Uwe Steinmann 2018-03-14 17:05:27 +01:00
parent 66f478b36a
commit 0c0669fbbd
3 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG
View File

@ -4,6 +4,8 @@
- fix setting attributes when checking in a new document version - fix setting attributes when checking in a new document version
- setting a document revision to 'needs correction' will no longer set the - setting a document revision to 'needs correction' will no longer set the
documents status to 'needѕ correction' if this was turned off in the settings documents status to 'needѕ correction' if this was turned off in the settings
- a document will not leave draft status when setting the approver/reviewer
without setting a reviewer/approver
- merge changes up to 5.1.6 - merge changes up to 5.1.6
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------

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

@ -3094,7 +3094,8 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
elseif ($pendingReview) $this->setStatus(S_DRAFT_REV,$msg,$user); elseif ($pendingReview) $this->setStatus(S_DRAFT_REV,$msg,$user);
elseif ($pendingApproval) $this->setStatus(S_DRAFT_APP,$msg,$user); elseif ($pendingApproval) $this->setStatus(S_DRAFT_APP,$msg,$user);
elseif ($pendingRevision) $this->setStatus(S_IN_REVISION,$msg,$user); elseif ($pendingRevision) $this->setStatus(S_IN_REVISION,$msg,$user);
else $this->setStatus(S_RELEASED,$msg,$user); /* A document in status S_DRAFT will never go into S_RELEASED */
elseif ($st["status"]!=S_DRAFT) $this->setStatus(S_RELEASED,$msg,$user);
} /* }}} */ } /* }}} */
function __construct($id, $document, $version, $comment, $date, $userID, $dir, $orgFileName, $fileType, $mimeType, $fileSize=0, $checksum='', $revisionDate=null) { /* {{{ */ function __construct($id, $document, $version, $comment, $date, $userID, $dir, $orgFileName, $fileType, $mimeType, $fileSize=0, $checksum='', $revisionDate=null) { /* {{{ */

26
SeedDMS_Core/package.xml
View File

@ -12,11 +12,11 @@
<email>uwe@steinmann.cx</email> <email>uwe@steinmann.cx</email>
<active>yes</active> <active>yes</active>
</lead> </lead>
<date>2018-02-27</date> <date>2018-03-14</date>
<time>09:19:24</time> <time>09:19:24</time>
<version> <version>
<release>6.0.5</release> <release>6.0.6</release>
<api>6.0.5</api> <api>6.0.6</api>
</version> </version>
<stability> <stability>
<release>stable</release> <release>stable</release>
@ -24,7 +24,9 @@
</stability> </stability>
<license uri="http://opensource.org/licenses/gpl-license">GPL License</license> <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
<notes> <notes>
add list 'NeedsCorrectionOwner' to SeedDMS_Core_DMS::getDocumentList() SeedDMS_Core_DocumentContent::verifyStatus() will not set status to S_RELEASED
if currently in S_DRAFT status und no workflow, review, approval, or revision
is pending.
</notes> </notes>
<contents> <contents>
<dir baseinstalldir="SeedDMS" name="/"> <dir baseinstalldir="SeedDMS" name="/">
@ -1694,5 +1696,21 @@ slower.
add SeedDMS_Core_DocumentContent::getInstance() add SeedDMS_Core_DocumentContent::getInstance()
</notes> </notes>
</release> </release>
<release>
<date>2018-02-27</date>
<time>09:19:24</time>
<version>
<release>6.0.5</release>
<api>6.0.5</api>
</version>
<stability>
<release>stable</release>
<api>stable</api>
</stability>
<license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
<notes>
add list 'NeedsCorrectionOwner' to SeedDMS_Core_DMS::getDocumentList()
</notes>
</release>
</changelog> </changelog>
</package> </package>