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

Merge branch 'seeddms-5.0.x' into seeddms-5.1.x

Browse Source
This commit is contained in:
Uwe Steinmann 2017-02-15 08:24:23 +01:00
commit be16e7edce
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1605,9 +1605,6 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
$this->_content = null; $this->_content = null;
$this->_latestContent = null; $this->_latestContent = null;
$content = $this->getLatestContent($contentID); $content = $this->getLatestContent($contentID);
// $content = new SeedDMS_Core_DocumentContent($contentID, $this, $version, $comment, $date, $user->getID(), $dir, $orgFileName, $fileType, $mimeType, $filesize, $checksum);
if($workflow)
$content->setWorkflow($workflow, $user);
$docResultSet = new SeedDMS_Core_AddContentResultSet($content); $docResultSet = new SeedDMS_Core_AddContentResultSet($content);
$docResultSet->setDMS($this->_dms); $docResultSet->setDMS($this->_dms);
@ -1637,6 +1634,9 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
$statusID = $db->getInsertID(); $statusID = $db->getInsertID();
if($workflow)
$content->setWorkflow($workflow, $user);
// Add reviewers into the database. Reviewers must review the document // Add reviewers into the database. Reviewers must review the document
// and submit comments, if appropriate. Reviewers can also recommend that // and submit comments, if appropriate. Reviewers can also recommend that
// a document be rejected. // a document be rejected.