gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-02-06 23:24:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Uwe Steinmann 2015-09-23 16:03:15 +02:00
commit 42dbb30e22
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2159,9 +2159,15 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
if (is_bool($resArr) && !$resArr) if (is_bool($resArr) && !$resArr)
return false; return false;
/* The above query will also contain entries where a document status exists
* but no status log entry. Those records will have no date and must be
* skipped.
*/
foreach ($resArr as $row) { foreach ($resArr as $row) {
$date = $row['date']; if($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'])); $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']));
}
} }
return $timeline; return $timeline;
} /* }}} */ } /* }}} */
@ -4454,7 +4460,7 @@ class SeedDMS_Core_AddContentResultSet { /* {{{ */
if (!is_integer($status)) { if (!is_integer($status)) {
return false; return false;
} }
if ($status<-3 || $status>2) { if ($status<-3 || $status>3) {
return false; return false;
} }
$this->_status = $status; $this->_status = $status;

2
out/out.Timeline.php
View File

@ -41,7 +41,7 @@ if(!empty($_GET['todate'])) {
$to = time(); $to = time();
} }
if(isset($_GET['skip'])) { if(isset($_GET['skip']))
$skip = $_GET['skip']; $skip = $_GET['skip'];
else else
$skip = array(); $skip = array();

2
views/bootstrap/class.ViewDocument.php
View File

@ -1181,9 +1181,9 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
</div> </div>
<?php <?php
if($user->isAdmin()) { if($user->isAdmin()) {
$this->contentHeading(getMLText("timeline"));
$timeline = $document->getTimeline(); $timeline = $document->getTimeline();
if($timeline) { if($timeline) {
$this->contentHeading(getMLText("timeline"));
foreach($timeline as &$item) { foreach($timeline as &$item) {
switch($item['type']) { switch($item['type']) {
case 'add_version': case 'add_version':