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

getTimeline() returns documents with a scheduled revision

Browse Source
This commit is contained in:
Uwe Steinmann 2017-12-19 08:19:48 +01:00
parent 7129b9737c
commit 3b3b5efafe
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SeedDMS_Core/Core/inc.ClassDMS.php
View File

@ -3475,7 +3475,7 @@ class SeedDMS_Core_DMS {
$endts = $startts+86400; $endts = $startts+86400;
$timeline = array(); $timeline = array();
$queryStr = "SELECT DISTINCT document FROM `tblDocumentContent` WHERE `date` > ".$startts." AND `date` < ".$endts." UNION SELECT DISTINCT document FROM `tblDocumentFiles` WHERE `date` > ".$startts." AND `date` < ".$endts; $queryStr = "SELECT DISTINCT document FROM `tblDocumentContent` WHERE `date` > ".$startts." AND `date` < ".$endts." OR `revisiondate` > '".date('Y-m-d H:i:s', $startts)."' AND `revisiondate` < '".date('Y-m-d H:i:s', $endts)."' UNION SELECT DISTINCT document FROM `tblDocumentFiles` WHERE `date` > ".$startts." AND `date` < ".$endts;
$resArr = $this->db->getResultArray($queryStr); $resArr = $this->db->getResultArray($queryStr);
if ($resArr === false) if ($resArr === false)
return false; return false;

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

@ -2765,18 +2765,15 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
$timeline = array(); $timeline = array();
/* No need to add entries for new version because the status log $queryStr = "SELECT `revisiondate`, `version` FROM `tblDocumentContent` WHERE `document` = " . $this->_id;
* will generate an entry as well.
$queryStr = "SELECT * FROM `tblDocumentContent` WHERE `document` = " . $this->_id;
$resArr = $db->getResultArray($queryStr); $resArr = $db->getResultArray($queryStr);
if (is_bool($resArr) && $resArr == false) if (is_bool($resArr) && $resArr == false)
return false; return false;
foreach ($resArr as $row) { foreach ($resArr as $row) {
$date = date('Y-m-d H:i:s', $row['date']); if($row['revisiondate'])
$timeline[] = array('date'=>$date, 'msg'=>'Added version '.$row['version'], 'type'=>'add_version', 'version'=>$row['version'], 'document'=>$this, 'params'=>array($row['version'])); $timeline[] = array('date'=>$row['revisiondate'], 'msg'=>'Scheduled revision of version '.$row['version'], 'type'=>'scheduled_revesion', 'version'=>$row['version'], 'document'=>$this, 'params'=>array($row['version']));
} }
*/
$queryStr = "SELECT * FROM `tblDocumentFiles` WHERE `document` = " . $this->_id; $queryStr = "SELECT * FROM `tblDocumentFiles` WHERE `document` = " . $this->_id;
$resArr = $db->getResultArray($queryStr); $resArr = $db->getResultArray($queryStr);

1
SeedDMS_Core/package.xml
View File

@ -35,6 +35,7 @@ are any waiting or pending revisions at all
- views instead of temp. tables can be used - views instead of temp. tables can be used
- ReceiveOwner list does not contain old versions anymore - ReceiveOwner list does not contain old versions anymore
- all changes up to 5.1.5 merged - all changes up to 5.1.5 merged
- getTimeline() also returns data for documents with a scheduled revision
</notes> </notes>
<contents> <contents>
<dir baseinstalldir="SeedDMS" name="/"> <dir baseinstalldir="SeedDMS" name="/">