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

- do not set date in tblWorkflowDocumentWorkflow

Browse Source 
- pass user to setWorkflow()
This commit is contained in:
steinm 2013-01-24 16:46:12 +00:00
parent 6211598ebf
commit 4c5106e828
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
LetoDMS_Core/Core/inc.ClassDocument.php
View File

@ -1141,7 +1141,7 @@ class LetoDMS_Core_Document extends LetoDMS_Core_Object { /* {{{ */
unset($this->_latestContent);
$content = new LetoDMS_Core_DocumentContent($contentID, $this, $version, $comment, $date, $user->getID(), $dir, $orgFileName, $fileType, $mimeType);
if($workflow)
$content->setWorkflow($workflow);
$content->setWorkflow($workflow, $user);
$docResultSet = new LetoDMS_Core_AddContentResultSet($content);
if($attributes) {
@ -2838,7 +2838,7 @@ class LetoDMS_Core_DocumentContent extends LetoDMS_Core_Object { /* {{{ */
$this->getWorkflow();
if($workflow && is_object($workflow)) {
$initstate = $workflow->getInitState();
$queryStr = "INSERT INTO tblWorkflowDocumentContent (workflow, document, version, state, date) VALUES (". $workflow->getID(). ", ". $this->_document->getID() .", ". $this->_version .", ".$initstate->getID().", CURRENT_TIMESTAMP)";
$queryStr = "INSERT INTO tblWorkflowDocumentContent (workflow, document, version, state) VALUES (". $workflow->getID(). ", ". $this->_document->getID() .", ". $this->_version .", ".$initstate->getID().")";
if (!$db->getResult($queryStr)) {
return false;
}
@ -2864,7 +2864,7 @@ class LetoDMS_Core_DocumentContent extends LetoDMS_Core_Object { /* {{{ */
$queryStr=
"SELECT b.* FROM tblWorkflowDocumentContent a LEFT JOIN tblWorkflows b ON a.workflow = b.id WHERE a.`version`='".$this->_version
."' AND a.`document` = '". $this->_document->getID() ."' "
."ORDER BY `date` DESC LIMIT 1";
." LIMIT 1";
$recs = $db->getResultArray($queryStr);
if (is_bool($recs) && !$recs)
return false;
@ -3012,7 +3012,7 @@ class LetoDMS_Core_DocumentContent extends LetoDMS_Core_Object { /* {{{ */
if($subworkflow) {
$initstate = $subworkflow->getInitState();
$queryStr = "INSERT INTO tblWorkflowDocumentContent (parentworkflow, workflow, document, version, state, date) VALUES (". $this->_workflow->getID(). ", ". $subworkflow->getID(). ", ". $this->_document->getID() .", ". $this->_version .", ".$initstate->getID().", CURRENT_TIMESTAMP)";
$queryStr = "INSERT INTO tblWorkflowDocumentContent (parentworkflow, workflow, document, version, state) VALUES (". $this->_workflow->getID(). ", ". $subworkflow->getID(). ", ". $this->_document->getID() .", ". $this->_version .", ".$initstate->getID().")";
if (!$db->getResult($queryStr)) {
return false;
}