gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-02-11 17:44:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

add optional parameter $initstate to checkIn()

Browse Source
This commit is contained in:
Uwe Steinmann 2015-06-24 20:34:40 +02:00
parent ac550a1ec1
commit 871ed870cc
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -808,13 +808,14 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
* @param integer $version
* @param array $attributes
* @param object $workflow
* @param integer $initstate intial document status
* @return boolean|object false in case of error, true if no error occurs but
* the document remains unchanged (because the checked out file has not
* changed or it has disappeared and couldnt't be checked in), or
* an instance of class SeedDMS_Core_AddContentResultSet if the document
* was updated.
*/
function checkIn($comment, $user, $reviewers=array(), $approvers=array(), $version=0, $attributes=array(), $workflow=null) { /* {{{ */
function checkIn($comment, $user, $reviewers=array(), $approvers=array(), $version=0, $attributes=array(), $workflow=null, $initstate=S_RELEASED) { /* {{{ */
$db = $this->_dms->getDB();
$info = self::getCheckOutInfo();
@ -840,7 +841,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
/* Do not create a new version if the file was unchanged */
$checksum = SeedDMS_Core_File::checksum($info['filename']);
if($checksum != $lc->getChecksum()) {
$content = $this->addContent($comment, $user, $info['filename'], $lc->getOriginalFileName(), $lc->getFileType(), $lc->getMimeType(), $reviewers, $approvers, $version, $attributes, $workflow);
$content = $this->addContent($comment, $user, $info['filename'], $lc->getOriginalFileName(), $lc->getFileType(), $lc->getMimeType(), $reviewers, $approvers, $version, $attributes, $workflow, $initstate);
if($content) {
if(!$this->_dms->forceRename) {
SeedDMS_Core_File::removeFile($info['filename']);
@ -1463,6 +1464,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
* @param array $attributes list of version attributes. The element key
* must be the id of the attribute definition.
* @param object $workflow
* @param integer $initstate intial document status
* @return bool/array false in case of an error or a result set
*/
function addContent($comment, $user, $tmpFile, $orgFileName, $fileType, $mimeType, $reviewers=array(), $approvers=array(), $version=0, $attributes=array(), $workflow=null, $initstate=S_RELEASED) { /* {{{ */