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

add statusid and fileid in entry of timeline

Browse Source
This commit is contained in:
Uwe Steinmann 2015-10-19 13:12:35 +02:00
parent 4e71830aaa
commit 54b2e8a881
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

@ -2114,11 +2114,11 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
foreach ($resArr as $row) { foreach ($resArr as $row) {
$date = date('Y-m-d H:i:s', $row['date']); $date = date('Y-m-d H:i:s', $row['date']);
$timeline[] = array('date'=>$date, 'msg'=>'Added attachment "'.$row['name'].'"', 'document'=>$this, 'type'=>'add_file'); $timeline[] = array('date'=>$date, 'msg'=>'Added attachment "'.$row['name'].'"', 'document'=>$this, 'type'=>'add_file', 'fileid'=>$row['id']);
} }
$queryStr= $queryStr=
"SELECT `tblDocumentStatus`.*, `tblDocumentStatusLog`.`status`, ". "SELECT `tblDocumentStatus`.*, `tblDocumentStatusLog`.`statusLogID`,`tblDocumentStatusLog`.`status`, ".
"`tblDocumentStatusLog`.`comment`, `tblDocumentStatusLog`.`date`, ". "`tblDocumentStatusLog`.`comment`, `tblDocumentStatusLog`.`date`, ".
"`tblDocumentStatusLog`.`userID` ". "`tblDocumentStatusLog`.`userID` ".
"FROM `tblDocumentStatus` ". "FROM `tblDocumentStatus` ".
@ -2136,7 +2136,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
foreach ($resArr as $row) { foreach ($resArr as $row) {
if($row['date']) { if($row['date']) {
$date = $row['date']; $date = $row['date'];
$timeline[] = array('date'=>$date, 'msg'=>'Version '.$row['version'].': Status change to '.$row['status'], 'type'=>'status_change', 'version'=>$row['version'], 'document'=>$this, 'status'=>$row['status'], 'params'=>array($row['version'], $row['status'])); $timeline[] = array('date'=>$date, 'msg'=>'Version '.$row['version'].': Status change to '.$row['status'], 'type'=>'status_change', 'version'=>$row['version'], 'document'=>$this, 'status'=>$row['status'], 'statusid'=>$row['statusID'], 'statuslogid'=>$row['statusLogID']);
} }
} }
return $timeline; return $timeline;